diff --git a/fsfw b/fsfw
index 82a645de..84f95e8d 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 82a645debaa43231ecb3d7e2c40cffc22546c348
+Subproject commit 84f95e8d7641be7a83faf1cbee718c6cc5de152d
diff --git a/linux/devices/startracker/StarTrackerHandler.cpp b/linux/devices/startracker/StarTrackerHandler.cpp
index c13faf5f..d06b73f1 100644
--- a/linux/devices/startracker/StarTrackerHandler.cpp
+++ b/linux/devices/startracker/StarTrackerHandler.cpp
@@ -672,7 +672,7 @@ ReturnValue_t StarTrackerHandler::isModeCombinationValid(Mode_t mode, Submode_t
         return INVALID_SUBMODE;
       }
     default:
-      return HasModesIF::MOVE_IS_INVALID;
+      return HasModesIF::INVALID_MODE;
   }
 }
 
diff --git a/mission/controller/ThermalController.cpp b/mission/controller/ThermalController.cpp
index b47f4fab..d79bb26a 100644
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@@ -42,7 +42,7 @@ ReturnValue_t ThermalController::checkModeCommand(Mode_t mode, Submode_t submode
     return INVALID_SUBMODE;
   }
   if ((mode != MODE_OFF) && (mode != MODE_ON) && (mode != MODE_NORMAL)) {
-    return MOVE_IS_INVALID;
+    return INVALID_MODE;
   }
   return RETURN_OK;
 }