diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 4099eefb48dfe90c8e9cfaf8aa4579e91da0679a..21f85dd6f39ab8be5b011222216942e258cd091b 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -184,13 +184,6 @@ inline const uint8_t ECSSMaxReportTypeDefinitions = 20;
  */
 inline const uint8_t ECSSMaxServiceTypeDefinitions = 15;
 
-/**
- * The max number of housekeeping structure IDs per housekeeping parameter report type definition in the housekeeping
- * parameter report configuration
- * @see RealTimeForwardingControlService
- */
-inline const uint8_t ECSSMaxHousekeepingStructureIDs = 10;
-
 /**
  * The max number of event definition IDs per event report blocking type definition in the event report blocking
  * configuration
diff --git a/inc/Helpers/ForwardControlConfiguration.hpp b/inc/Helpers/ForwardControlConfiguration.hpp
index ad47508c00f9631dbea055ea90c1df701c95b35b..ec94f0d10ba7ee2b55514e736e7cd388743ef8bd 100644
--- a/inc/Helpers/ForwardControlConfiguration.hpp
+++ b/inc/Helpers/ForwardControlConfiguration.hpp
@@ -74,7 +74,7 @@ public:
 	/**
 	 * Vector containing the Housekeeping structure IDs.
 	 */
-	typedef etl::vector<uint8_t, ECSSMaxHousekeepingStructureIDs> housekeepingStructureIds;
+	typedef etl::vector<uint8_t, ECSSMaxHousekeepingStructures> housekeepingStructureIds;
 
 	/**
 	 * Map containing the Housekeeping definitions (application processes). Each application has its own ID. The ID is