diff --git a/inc/Helpers/ForwardControlConfiguration.hpp b/inc/Helpers/ForwardControlConfiguration.hpp
index ec94f0d10ba7ee2b55514e736e7cd388743ef8bd..df29ff346709f7aad403de7b12aac512953a6b1d 100644
--- a/inc/Helpers/ForwardControlConfiguration.hpp
+++ b/inc/Helpers/ForwardControlConfiguration.hpp
@@ -36,7 +36,7 @@ public:
 	 * it has not been filled yet (so we proceed to add new report types) or it is empty because we block every
 	 * report type for the service.
 	 */
-	etl::map<uint8_t, reportsNotEmpty, ECSSMaxControlledApplications> notEmpty;
+	etl::map<uint8_t, reportsNotEmpty, ECSSMaxControlledApplicationProcesses> notEmpty;
 
 	/**
 	 * Vector containing the Report Type definitions. Each definition has its unique name of type uint8. For
@@ -55,7 +55,7 @@ public:
 	 * Map containing the Application Process definitions. Each application has its own ID. The ID is used as a
 	 * key to provide access to the list of Service Type definitions, included by the application.
 	 */
-	etl::map<uint8_t, serviceTypeDefinitions, ECSSMaxControlledApplications> definitions;
+	etl::map<uint8_t, serviceTypeDefinitions, ECSSMaxControlledApplicationProcesses> definitions;
 
 	ApplicationProcess() = default;
 };
@@ -80,7 +80,7 @@ public:
 	 * Map containing the Housekeeping definitions (application processes). Each application has its own ID. The ID is
 	 * used as a key to provide access to the list of the Housekeeping structure IDs.
 	 */
-	typedef etl::map<uint8_t, housekeepingStructureIds, ECSSMaxControlledApplications> definitions;
+	typedef etl::map<uint8_t, housekeepingStructureIds, ECSSMaxControlledApplicationProcesses> definitions;
 
 	HousekeepingParameterReport() = default;
 };
@@ -105,7 +105,7 @@ public:
 	 * Map containing the Event Report Blocking definitions (applications). Each application has its own ID. The ID is
 	 * used as a key to provide access to the list of the Event Definitions.
 	 */
-	typedef etl::map<uint8_t, eventDefinitionIds, ECSSMaxControlledApplications> definitions;
+	typedef etl::map<uint8_t, eventDefinitionIds, ECSSMaxControlledApplicationProcesses> definitions;
 
 	EventReportBlocking() = default;
 };
diff --git a/inc/Services/RealTimeForwardingControlService.hpp b/inc/Services/RealTimeForwardingControlService.hpp
index 2e231b7f92dd6316fb4f2e6aabe2cff831bf10bd..d78e95816f932c09572bad9abb43ab8b7f6c7aaf 100644
--- a/inc/Services/RealTimeForwardingControlService.hpp
+++ b/inc/Services/RealTimeForwardingControlService.hpp
@@ -41,7 +41,7 @@ public:
 	/**
 	 * Contains the Application IDs, controlled by the Service.
 	 */
-	etl::vector<uint8_t, ECSSMaxControlledApplications> controlledApplications;
+	etl::vector<uint8_t, ECSSMaxControlledApplicationProcesses> controlledApplications;
 
 	/**
 	 * The Application Process configuration, containing all the application process, service type and message type