diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 34cd378397a27ce510c084ede2dc89ff14441bc7..38e3b64ab22bbac6aca19d0fb3c3fab09cfdeb45 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -52,8 +52,8 @@ void EventActionService::deleteEventActionDefinitions(Message message) {
 	// TC[19,2]
 	if (message.messageType == 2 && message.packetType == Message::TC && message.serviceType
 	                                                                     == 19) {
-		uint16_t N = message.readUint16();
-		for (uint16_t i = 0; i < N; i++) {
+		uint16_t numberOfEventActionDefinitions = message.readUint16();
+		for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
 			uint16_t applicationID = message.readEnum16();
 			uint16_t eventDefinitionID = message.readEnum16();
 			for (uint16_t index = 0; index < ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE; index++) {
@@ -93,9 +93,9 @@ void EventActionService::enableEventActionDefinitions(Message message) {
 	// TC[19,4]
 	if (message.messageType == 4 && message.packetType == Message::TC && message.serviceType
 	                                                                     == 19) {
-		uint16_t N = message.readUint16();
-		if (N != 0){
-			for (uint16_t i = 0; i < N; i++) {
+		uint16_t numberOfEventActionDefinitions = message.readUint16();
+		if (numberOfEventActionDefinitions != 0){
+			for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
 				uint16_t applicationID = message.readEnum16();
 				uint16_t eventDefinitionID = message.readEnum16();
 				for (uint16_t index = 0; index < ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE; index++) {
@@ -119,9 +119,9 @@ void EventActionService::disableEventActionDefinitions(Message message) {
 	// TC[19,5]
 	if (message.messageType == 5 && message.packetType == Message::TC && message.serviceType
 	                                                                     == 19) {
-		uint16_t N = message.readUint16();
-		if (N != 0){
-			for (uint16_t i = 0; i < N; i++) {
+		uint16_t numberOfEventActionDefinitions = message.readUint16();
+		if (numberOfEventActionDefinitions != 0){
+			for (uint16_t i = 0; i < numberOfEventActionDefinitions; i++) {
 				uint16_t applicationID = message.readEnum16();
 				uint16_t eventDefinitionID = message.readEnum16();
 				for (uint16_t index = 0; index < ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE; index++) {