diff --git a/inc/ECSS_Definitions.hpp b/inc/ECSS_Definitions.hpp
index 2b5ff9fd8cbd887e6a894a7774a7d0f0d3c8d274..9bbcb5c1a433955104eb8f545a6dd713dd78228b 100644
--- a/inc/ECSS_Definitions.hpp
+++ b/inc/ECSS_Definitions.hpp
@@ -6,8 +6,8 @@
 
 #define ECSS_MAX_STRING_SIZE 256
 
-//7.4.1
-#define ECSS_PACKET_VERSION 0
+// 7.4.1
+#define CCSDS_PACKET_VERSION 0
 
 // 7.4.4.1c
 #define ECSS_PUS_VERSION 2
diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp
index fc1db397c2401d94048879a77f4896e158e4c7c8..8e6d2635be5546ca2394299cb7c2cbbd84a01b21 100644
--- a/inc/Services/RequestVerificationService.hpp
+++ b/inc/Services/RequestVerificationService.hpp
@@ -23,7 +23,7 @@ public:
 	/**
 	 * TM[1,1] successful acceptance verification report
 	 *
-	 * @param request Message& reference, that contains the necessary data to send the report.
+	 * @param request Contains the necessary data to send the report.
 	 * The data is actually some data members of Message that contain the basic info
 	 * of the telecommand packet that accepted successfully
 	 *
@@ -33,7 +33,7 @@ public:
 	/**
 	 * TM[1,2] failed acceptance verification report
 	 *
-	 * @param request Message& reference, that contains the necessary data to send the report.
+	 * @param request Contains the necessary data to send the report.
 	 * The data is actually some data members of Message that contain the basic
 	 * info of the telecommand packet that failed to be accepted
 	 */
@@ -43,7 +43,7 @@ public:
 	/**
  	 * TM[1,7] successful completion of execution verification report
 	 *
-	 * @param request Message& reference, that contains the necessary data to send the report.
+	 * @param request Contains the necessary data to send the report.
 	 * The data is actually data members of Message that contain the basic info of the
 	 * telecommand packet that executed successfully
 	 *
@@ -53,9 +53,9 @@ public:
 	/**
 	 * TM[1,8] failed completion of execution verification report
 	 *
-	 * @param request Message& reference, that contains the necessary data to send the report.
+	 * @param request Contains the necessary data to send the report.
 	 * The data is actually some data members of Message that contain the basic info of the
-	 * telecommand packet that failed  to be executed
+	 * telecommand packet that failed to be executed
 	 *
 	 */
 	void failExecutionVerification(Message &request);
@@ -63,7 +63,7 @@ public:
 	/**
 	 * TM[1,10] failed routing verification report
 	 *
-	 * @param request Message& reference, that contains the necessary data to send the report.
+	 * @param request Contains the necessary data to send the report.
 	 * The data is actually some data members of Message that contain the basic info of the
 	 * telecommand packet that failed the routing
 	 *
diff --git a/src/Services/RequestVerificationService.cpp b/src/Services/RequestVerificationService.cpp
index ba9779625acf079947e8542587b29d88a837a229..f3029fcd5b655f97d89f8693be4d686571537aab 100644
--- a/src/Services/RequestVerificationService.cpp
+++ b/src/Services/RequestVerificationService.cpp
@@ -6,7 +6,7 @@ void RequestVerificationService::successAcceptanceVerification(Message &request)
 
 	Message report = createTM(1);
 
-	report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+	report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
 	report.appendEnumerated(1, request.packetType); // packet type
 	report.appendBits(1, 0); // secondary header flag(not implemented)
 	report.appendEnumerated(11, request.applicationId); // application process ID
@@ -22,7 +22,7 @@ RequestVerificationService::failAcceptanceVerification(Message &request) {
 
 	Message report = createTM(2);
 
-	report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+	report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
 	report.appendEnumerated(1, request.packetType); // packet type
 	report.appendBits(1, 0); // secondary header flag(not implemented)
 	report.appendEnumerated(11, request.applicationId); // application process ID
@@ -38,7 +38,7 @@ void RequestVerificationService::successExecutionVerification(Message &request)
 
 	Message report = createTM(7);
 
-	report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+	report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
 	report.appendEnumerated(1, request.packetType); // packet type
 	report.appendBits(1, 0); // secondary header flag(not implemented)
 	report.appendEnumerated(11, request.applicationId); // application process ID
@@ -54,7 +54,7 @@ RequestVerificationService::failExecutionVerification(Message &request) {
 
 	Message report = createTM(8);
 
-	report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+	report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
 	report.appendEnumerated(1, request.packetType); // packet type
 	report.appendBits(1, 0); // secondary header flag(not implemented)
 	report.appendEnumerated(11, request.applicationId); // application process ID
@@ -71,7 +71,7 @@ RequestVerificationService::failRoutingVerification(Message &request) {
 
 	Message report = createTM(10);
 
-	report.appendEnumerated(3, ECSS_PACKET_VERSION); // packet version number
+	report.appendEnumerated(3, CCSDS_PACKET_VERSION); // packet version number
 	report.appendEnumerated(1, request.packetType); // packet type
 	report.appendBits(1, 0); // secondary header flag(not implemented)
 	report.appendEnumerated(11, request.applicationId); // application process ID
diff --git a/test/Services/RequestVerificationService.cpp b/test/Services/RequestVerificationService.cpp
index 18f468175d0944449e4d8337afd53c287933b311..65a256d3d37010317e7b61106beeb2083f7e976e 100644
--- a/test/Services/RequestVerificationService.cpp
+++ b/test/Services/RequestVerificationService.cpp
@@ -18,7 +18,7 @@ TEST_CASE("TM[1,1]", "[service][st01]") {
 	CHECK(response.applicationId == 0);
 	REQUIRE(response.dataSize == 4); // dataSize is the number of bytes of data array
 	// Check for the value that is stored in <<data>> array(data-member of object response)
-	CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+	CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
 	CHECK(response.readEnumerated(1) == Message::TC); // packet type
 	CHECK(response.readBits(1) == 0); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -41,7 +41,7 @@ TEST_CASE("TM[1,2]", "[service][st01]") {
 	CHECK(response.applicationId == 0);
 	REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
 	// Check for the value that is stored in <<data>> array(data-member of object response)
-	CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+	CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
 	CHECK(response.readEnumerated(1) == Message::TC); // packet type
 	CHECK(response.readBits(1) == 0); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -65,7 +65,7 @@ TEST_CASE("TM[1,7]", "[service][st01]") {
 	CHECK(response.applicationId == 0);
 	REQUIRE(response.dataSize == 4); // dataSize is the number of bytes of data array
 	// Check for the value that is stored in <<data>> array(data-member of object response)
-	CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+	CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
 	CHECK(response.readEnumerated(1) == Message::TC); // packet type
 	CHECK(response.readBits(1) == 0); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -87,7 +87,7 @@ TEST_CASE("TM[1,8]", "[service][st01]") {
 	CHECK(response.applicationId == 0);
 	REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
 	// Check for the value that is stored in <<data>> array(data-member of object response)
-	CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+	CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
 	CHECK(response.readEnumerated(1) == Message::TC); // packet type
 	CHECK(response.readBits(1) == 0); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID
@@ -111,7 +111,7 @@ TEST_CASE("TM[1,10]", "[service][st01]") {
 	CHECK(response.applicationId == 0);
 	REQUIRE(response.dataSize == 6); // dataSize is the number of bytes of data array
 	// Check for the value that is stored in <<data>> array(data-member of object response)
-	CHECK(response.readEnumerated(3) == ECSS_PACKET_VERSION); // packet version number
+	CHECK(response.readEnumerated(3) == CCSDS_PACKET_VERSION); // packet version number
 	CHECK(response.readEnumerated(1) == Message::TC); // packet type
 	CHECK(response.readBits(1) == 0); // secondary header flag
 	CHECK(response.readEnumerated(11) == 3); // application process ID