diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index 4d1d09bc7..e7de914b7 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -1566,7 +1566,7 @@ LocalDataPoolManager* DeviceHandlerBase::getHkManagerHandle() {
     return &poolManager;
 }
 
-MessageQueueId_t DeviceHandlerBase::getCommanderId(DeviceCommandId_t replyId) const {
+MessageQueueId_t DeviceHandlerBase::getCommanderQueueId(DeviceCommandId_t replyId) const {
     auto commandIter = deviceCommandMap.find(replyId);
     if(commandIter == deviceCommandMap.end()) {
         return MessageQueueIF::NO_QUEUE;
diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index f6c22f0a0..e8ef9adab 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -332,6 +332,9 @@ protected:
      * interface. NO_REPLY_EXPECTED should be returned for a finish reply, RETURN_OK should be
      * returned for a step reply and everything else will trigger a step failure.
      *
+     * If the commander ID is required for generating a finish reply immediately, it can be
+     * retrieved using the #getCommanderQueueId function.
+     *
      * @param deviceCommand     The command to build, already checked against deviceCommandMap
      * @param commandData       Pointer to the data from the direct command
      * @param commandDataLen    Length of commandData
@@ -401,7 +404,7 @@ protected:
      */
     virtual ReturnValue_t interpretDeviceReply(DeviceCommandId_t id,
             const uint8_t *packet) = 0;
-    MessageQueueId_t getCommanderId(DeviceCommandId_t replyId) const;
+    MessageQueueId_t getCommanderQueueId(DeviceCommandId_t replyId) const;
     /**
      * Helper function to get pending command. This is useful for devices
      * like SPI sensors to identify the last sent command.