diff --git a/container/FIFO.h b/container/FIFO.h
index 217ddbca..801df6a2 100644
--- a/container/FIFO.h
+++ b/container/FIFO.h
@@ -4,6 +4,8 @@
 #include <framework/container/FIFOBase.h>
 #include <vector>
 
+namespace fifo {
+
 /**
  * @brief 	Simple First-In-First-Out data structure. The maximum size
  * 			can be set in the constructor. THe public interface of
@@ -23,4 +25,6 @@ private:
 	std::vector<T> values;
 };
 
+}
+
 #endif /* FRAMEWORK_CONTAINER_FIFO_H_ */
diff --git a/container/FIFOBase.h b/container/FIFOBase.h
index c6a74d2f..ac5c6e2c 100644
--- a/container/FIFOBase.h
+++ b/container/FIFOBase.h
@@ -4,6 +4,8 @@
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <cstddef>
 
+namespace fsfw {
+
 template <typename T>
 class FIFOBase {
 public:
@@ -11,8 +13,8 @@ public:
 	static const ReturnValue_t FULL = MAKE_RETURN_CODE(1);
 	static const ReturnValue_t EMPTY = MAKE_RETURN_CODE(2);
 
-
-	/** Default ctor, no input arguments required. */
+	/** Default ctor, takes pointer to first entry of underlying container
+	 *  and maximum capacity */
 	FIFOBase(T* values, const size_t maxCapacity);
 
 	/**
@@ -56,4 +58,6 @@ private:
 
 #include <framework/container/FIFOBase.tpp>
 
+}
+
 #endif /* FRAMEWORK_CONTAINER_FIFOBASE_H_ */
diff --git a/container/StaticFIFO.h b/container/StaticFIFO.h
index 780b0383..f3128200 100644
--- a/container/StaticFIFO.h
+++ b/container/StaticFIFO.h
@@ -5,10 +5,14 @@
 #include <framework/container/FIFOBase.h>
 #include <array>
 
+namespace fsfw {
+
 /**
  * @brief 	Simple First-In-First-Out data structure with size fixed at
- * 			compile time. The public interface of FIFOBase exposes
- * 			the user interface for the FIFO.
+ * 			compile time
+ * @details
+ * Performs no dynamic memory allocation.
+ * The public interface of FIFOBase exposes the user interface for the FIFO.
  * @tparam T Entry Type
  * @tparam capacity Maximum capacity
  */
@@ -21,4 +25,6 @@ private:
 	std::array<T, capacity> values;
 };
 
+}
+
 #endif /* FRAMEWORK_CONTAINERS_STATICFIFO_H_ */
diff --git a/tmtcservices/CommandingServiceBase.h b/tmtcservices/CommandingServiceBase.h
index b3132be5..a4343065 100644
--- a/tmtcservices/CommandingServiceBase.h
+++ b/tmtcservices/CommandingServiceBase.h
@@ -179,7 +179,7 @@ protected:
 		uint32_t state;
 		Command_t command;
 		object_id_t objectId;
-		StaticFIFO<store_address_t, 3> fifo;
+		fsfw::StaticFIFO<store_address_t, 3> fifo;
 	};
 
 	const uint16_t apid;