diff --git a/fsfw b/fsfw
index 60dcacf4..cb1aaea6 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 60dcacf432aa0a7b739f8fdf8bf4aaa37ac614e5
+Subproject commit cb1aaea6cd10f34bf46adf8f91f86af1fb42041a
diff --git a/mission/cfdp/CfdpHandler.cpp b/mission/cfdp/CfdpHandler.cpp
index 2badd560..72a54a88 100644
--- a/mission/cfdp/CfdpHandler.cpp
+++ b/mission/cfdp/CfdpHandler.cpp
@@ -11,7 +11,7 @@ using namespace cfdp;
 
 CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwHandlerParams, const CfdpHandlerCfg& cfdpCfg)
     : SystemObject(fsfwHandlerParams.objectId),
-      tmtcQueue(fsfwHandlerParams.tmtcQueue),
+      pduQueue(fsfwHandlerParams.tmtcQueue),
       cfdpRequestQueue(fsfwHandlerParams.cfdpQueue),
       localCfg(cfdpCfg.id, cfdpCfg.indicCfg, cfdpCfg.faultHandler),
       fsfwParams(fsfwHandlerParams.packetDest, &fsfwHandlerParams.tmtcQueue, this,
@@ -28,7 +28,7 @@ CfdpHandler::CfdpHandler(const FsfwHandlerParams& fsfwHandlerParams, const CfdpH
   return destHandler.getDestHandlerParams().cfg.localId.getValue();
 }
 
-[[nodiscard]] MessageQueueId_t CfdpHandler::getRequestQueue() const { return tmtcQueue.getId(); }
+[[nodiscard]] MessageQueueId_t CfdpHandler::getRequestQueue() const { return pduQueue.getId(); }
 
 ReturnValue_t CfdpHandler::initialize() {
   ReturnValue_t result = destHandler.initialize();
@@ -47,9 +47,9 @@ ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
   ReturnValue_t status;
   ReturnValue_t result = OK;
   TmTcMessage tmtcMsg;
-  for (status = tmtcQueue.receiveMessage(&tmtcMsg); status == returnvalue::OK;
-       status = tmtcQueue.receiveMessage(&tmtcMsg)) {
-    result = handleCfdpPacket(tmtcMsg);
+  for (status = pduQueue.receiveMessage(&tmtcMsg); status == returnvalue::OK;
+       status = pduQueue.receiveMessage(&tmtcMsg)) {
+    result = handlePduPacket(tmtcMsg);
     if (result != OK) {
       status = result;
     }
@@ -67,7 +67,7 @@ ReturnValue_t CfdpHandler::performOperation(uint8_t operationCode) {
   return status;
 }
 
-ReturnValue_t CfdpHandler::handleCfdpPacket(TmTcMessage& msg) {
+ReturnValue_t CfdpHandler::handlePduPacket(TmTcMessage& msg) {
   auto accessorPair = tcStore->getData(msg.getStorageId());
   if (accessorPair.first != OK) {
     return accessorPair.first;
diff --git a/mission/cfdp/CfdpHandler.h b/mission/cfdp/CfdpHandler.h
index da526590..6ee4b07b 100644
--- a/mission/cfdp/CfdpHandler.h
+++ b/mission/cfdp/CfdpHandler.h
@@ -66,7 +66,7 @@ class CfdpHandler : public SystemObject, public ExecutableObjectIF, public Accep
   ReturnValue_t performOperation(uint8_t operationCode) override;
 
  private:
-  MessageQueueIF& tmtcQueue;
+  MessageQueueIF& pduQueue;
   MessageQueueIF& cfdpRequestQueue;
   cfdp::LocalEntityCfg localCfg;
   cfdp::FsfwParams fsfwParams;
@@ -77,7 +77,7 @@ class CfdpHandler : public SystemObject, public ExecutableObjectIF, public Accep
   StorageManagerIF* tcStore = nullptr;
   StorageManagerIF* tmStore = nullptr;
 
-  ReturnValue_t handleCfdpPacket(TmTcMessage& msg);
+  ReturnValue_t handlePduPacket(TmTcMessage& msg);
 };
 
 #endif  // FSFW_EXAMPLE_HOSTED_CFDPHANDLER_H