diff --git a/src/fsfw/devicehandlers/AssemblyBase.cpp b/src/fsfw/devicehandlers/AssemblyBase.cpp
index 45f62ba0..837f5bcb 100644
--- a/src/fsfw/devicehandlers/AssemblyBase.cpp
+++ b/src/fsfw/devicehandlers/AssemblyBase.cpp
@@ -196,7 +196,7 @@ ReturnValue_t AssemblyBase::checkModeCommand(Mode_t mode, Submode_t submode,
   }
 
   if ((mode != MODE_ON) && (mode != DeviceHandlerIF::MODE_NORMAL)) {
-    return INVALID_MODE_RETVAL;
+    return MOVE_IS_INVALID;
   }
 
   if (internalState != STATE_NONE) {
diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index 6213ea86..7cfd38eb 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -403,7 +403,7 @@ ReturnValue_t DeviceHandlerBase::isModeCombinationValid(Mode_t mode, Submode_t s
         return INVALID_SUBMODE;
       }
     default:
-      return HasModesIF::INVALID_MODE_RETVAL;
+      return HasModesIF::MOVE_IS_INVALID;
   }
 }
 
diff --git a/src/fsfw/modes/HasModesIF.h b/src/fsfw/modes/HasModesIF.h
index d59e0294..9295d2b9 100644
--- a/src/fsfw/modes/HasModesIF.h
+++ b/src/fsfw/modes/HasModesIF.h
@@ -13,7 +13,7 @@ class HasModesIF {
 
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::HAS_MODES_IF;
-  static const ReturnValue_t INVALID_MODE_RETVAL = MAKE_RETURN_CODE(0x01);
+  static const ReturnValue_t MOVE_IS_INVALID = MAKE_RETURN_CODE(0x01);
   static const ReturnValue_t TRANS_NOT_ALLOWED = MAKE_RETURN_CODE(0x02);
   static const ReturnValue_t IN_TRANSITION = MAKE_RETURN_CODE(0x03);
   static const ReturnValue_t INVALID_SUBMODE = MAKE_RETURN_CODE(0x04);
diff --git a/tests/src/fsfw_tests/integration/assemblies/TestAssembly.cpp b/tests/src/fsfw_tests/integration/assemblies/TestAssembly.cpp
index 8e79bbc6..b410ab36 100644
--- a/tests/src/fsfw_tests/integration/assemblies/TestAssembly.cpp
+++ b/tests/src/fsfw_tests/integration/assemblies/TestAssembly.cpp
@@ -125,7 +125,7 @@ ReturnValue_t TestAssembly::isModeCombinationValid(Mode_t mode, Submode_t submod
         return INVALID_SUBMODE;
       }
   }
-  return INVALID_MODE_RETVAL;
+  return MOVE_IS_INVALID;
 }
 
 ReturnValue_t TestAssembly::initialize() {