diff --git a/src/fsfw/cfdp/handler/CMakeLists.txt b/src/fsfw/cfdp/handler/CMakeLists.txt
index 710c5862..8ba2fec8 100644
--- a/src/fsfw/cfdp/handler/CMakeLists.txt
+++ b/src/fsfw/cfdp/handler/CMakeLists.txt
@@ -1,4 +1,4 @@
 target_sources(
   ${LIB_FSFW_NAME}
-  PRIVATE SourceHandler.cpp DestHandler.cpp PutRequest.cpp MsgToUserParser.cpp
-          FaultHandlerBase.cpp UserBase.cpp)
+  PRIVATE SourceHandler.cpp DestHandler.cpp PutRequest.cpp
+          ReservedMessageParser.cpp FaultHandlerBase.cpp UserBase.cpp)
diff --git a/src/fsfw/cfdp/handler/MsgToUserParser.cpp b/src/fsfw/cfdp/handler/ReservedMessageParser.cpp
similarity index 85%
rename from src/fsfw/cfdp/handler/MsgToUserParser.cpp
rename to src/fsfw/cfdp/handler/ReservedMessageParser.cpp
index 3279c176..f080cd27 100644
--- a/src/fsfw/cfdp/handler/MsgToUserParser.cpp
+++ b/src/fsfw/cfdp/handler/ReservedMessageParser.cpp
@@ -1,5 +1,4 @@
-#include "MsgToUserParser.h"
-
+#include "ReserverMessageParser.h"
 #include "fsfw/cfdp/CfdpMessage.h"
 #include "fsfw/cfdp/handler/PutRequest.h"
 #include "fsfw/cfdp/tlv/MessageToUserTlv.h"
@@ -8,12 +7,13 @@
 
 using namespace returnvalue;
 
-cfdp::MsgsToUserParser::MsgsToUserParser(StorageManagerIF& ipcStore, MessageQueueIF& msgQueue,
-                                         MessageQueueId_t userDestination)
+cfdp::ReservedMessageParser::ReservedMessageParser(StorageManagerIF& ipcStore,
+                                                   MessageQueueIF& msgQueue,
+                                                   MessageQueueId_t userDestination)
     : msgQueue(msgQueue), ipcStore(ipcStore) {}
 
-ReturnValue_t cfdp::MsgsToUserParser::parseMessages(const uint8_t* msgsToUserPtr,
-                                                    size_t sizeOfMessages) {
+ReturnValue_t cfdp::ReservedMessageParser::parseForReserverMessages(const uint8_t* msgsToUserPtr,
+                                                                    size_t sizeOfMessages) {
   ReturnValue_t result;
   size_t currentIdx = 0;
   const uint8_t* currentPtr = msgsToUserPtr;
diff --git a/src/fsfw/cfdp/handler/MsgToUserParser.h b/src/fsfw/cfdp/handler/ReserverMessageParser.h
similarity index 67%
rename from src/fsfw/cfdp/handler/MsgToUserParser.h
rename to src/fsfw/cfdp/handler/ReserverMessageParser.h
index b2ef04c3..fc661949 100644
--- a/src/fsfw/cfdp/handler/MsgToUserParser.h
+++ b/src/fsfw/cfdp/handler/ReserverMessageParser.h
@@ -10,12 +10,12 @@ namespace cfdp {
  * CFDP requests sent via the IPC store where applicable. It also provides an API to retrieve
  * custom messages which are not special CFDP messages from a provided bytestream.
  */
-class MsgsToUserParser {
+class ReservedMessageParser {
  public:
-  MsgsToUserParser(StorageManagerIF& ipcStore, MessageQueueIF& msgQueue,
-                   MessageQueueId_t userDestination);
+  ReservedMessageParser(StorageManagerIF& ipcStore, MessageQueueIF& msgQueue,
+                        MessageQueueId_t userDestination);
 
-  ReturnValue_t parseMessages(const uint8_t* msgsToUserPtr, size_t sizeOfMessages);
+  ReturnValue_t parseForReserverMessages(const uint8_t* msgsToUserPtr, size_t sizeOfMessages);
 
  private:
   MessageQueueIF& msgQueue;