diff --git a/container/DynamicFIFO.h b/container/DynamicFIFO.h
index 5cdae81a..7fa0c32c 100644
--- a/container/DynamicFIFO.h
+++ b/container/DynamicFIFO.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
-#define FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
+#ifndef FSFW_CONTAINER_DYNAMICFIFO_H_
+#define FSFW_CONTAINER_DYNAMICFIFO_H_
 
 #include "FIFOBase.h"
 #include <vector>
@@ -39,4 +39,4 @@ private:
 	std::vector<T> fifoVector;
 };
 
-#endif /* FRAMEWORK_CONTAINER_DYNAMICFIFO_H_ */
+#endif /* FSFW_CONTAINER_DYNAMICFIFO_H_ */
diff --git a/container/FIFOBase.h b/container/FIFOBase.h
index acb38b82..bbabd67c 100644
--- a/container/FIFOBase.h
+++ b/container/FIFOBase.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_CONTAINER_FIFOBASE_H_
-#define FRAMEWORK_CONTAINER_FIFOBASE_H_
+#ifndef FSFW_CONTAINER_FIFOBASE_H_
+#define FSFW_CONTAINER_FIFOBASE_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include <cstddef>
@@ -62,4 +62,4 @@ protected:
 
 #include "FIFOBase.tpp"
 
-#endif /* FRAMEWORK_CONTAINER_FIFOBASE_H_ */
+#endif /* FSFW_CONTAINER_FIFOBASE_H_ */
diff --git a/container/FIFOBase.tpp b/container/FIFOBase.tpp
index c73e9d59..e1287dcf 100644
--- a/container/FIFOBase.tpp
+++ b/container/FIFOBase.tpp
@@ -1,7 +1,7 @@
-#ifndef FRAMEWORK_CONTAINER_FIFOBASE_TPP_
-#define FRAMEWORK_CONTAINER_FIFOBASE_TPP_
+#ifndef FSFW_CONTAINER_FIFOBASE_TPP_
+#define FSFW_CONTAINER_FIFOBASE_TPP_
 
-#ifndef FRAMEWORK_CONTAINER_FIFOBASE_H_
+#ifndef FSFW_CONTAINER_FIFOBASE_H_
 #error Include FIFOBase.h before FIFOBase.tpp!
 #endif