diff --git a/src/fsfw/tmtcpacket/SpacePacket.h b/src/fsfw/tmtcpacket/SpacePacket.h
index 67746859..fe8a1044 100644
--- a/src/fsfw/tmtcpacket/SpacePacket.h
+++ b/src/fsfw/tmtcpacket/SpacePacket.h
@@ -69,6 +69,8 @@ protected:
     SpacePacketData localData;
 };
 
+namespace spacepacket {
+
 constexpr uint16_t getTcSpacePacketIdFromApid(uint16_t apid) {
     return (0x18 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
 }
@@ -77,4 +79,6 @@ constexpr uint16_t getTmSpacePacketIdFromApid(uint16_t apid) {
     return (0x08 << 8) | (((apid >> 8) & 0x07) << 8) | (apid & 0x00ff);
 }
 
+}
+
 #endif /* SPACEPACKET_H_ */