diff --git a/pus/Service8FunctionManagement.cpp b/pus/Service8FunctionManagement.cpp
index 47afeae6..24338464 100644
--- a/pus/Service8FunctionManagement.cpp
+++ b/pus/Service8FunctionManagement.cpp
@@ -67,7 +67,7 @@ ReturnValue_t Service8FunctionManagement::prepareDirectCommand(
 	// Create direct command instance by extracting data from Telecommand
 	DirectCommand command(tcData,tcDataLen);
 
-	// store additional parameters into the Inter Process Communication Store
+	// store additional parameters into the IPC Store
 	store_address_t parameterAddress;
 	ReturnValue_t result = IPCStore->addData(&parameterAddress,
 			command.getParameters(),command.getParametersSize());
diff --git a/pus/Service8FunctionManagement.h b/pus/Service8FunctionManagement.h
index e06c554c..54c98b97 100644
--- a/pus/Service8FunctionManagement.h
+++ b/pus/Service8FunctionManagement.h
@@ -1,5 +1,5 @@
-#ifndef MISSION_SERVICE8FUNCTIONMANAGEMENT_H_
-#define MISSION_SERVICE8FUNCTIONMANAGEMENT_H_
+#ifndef FRAMEWORK_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
+#define FRAMEWORK_PUS_SERVICE8FUNCTIONMANAGEMENT_H_
 
 #include <framework/tmtcservices/CommandingServiceBase.h>
 
@@ -61,4 +61,4 @@ private:
 			const uint8_t* tcData, size_t tcDataLen);
 };
 
-#endif /* MISSION_DEVICE2DEVICECOMMANDING_H_ */
+#endif /* FRAMEWORK_PUS_SERVICE8FUNCTIONMANAGEMENT_H_ */