diff --git a/bsp_q7s/core/InitMission.cpp b/bsp_q7s/core/InitMission.cpp
index 3aed9bd8..01662b59 100644
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@@ -160,7 +160,7 @@ void initmission::initTasks() {
   }
 #endif
   result = sysTask->addComponent(objects::ACS_SUBSYSTEM);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     initmission::printAddObjectError("ACS_SUBSYSTEM", objects::ACS_SUBSYSTEM);
   }
 
diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp
index bfab8c26..9f7d18df 100644
--- a/mission/system/tree/acsModeTree.cpp
+++ b/mission/system/tree/acsModeTree.cpp
@@ -382,7 +382,7 @@ void buildTargetPtSequence(Subsystem* ss, ModeListEntry& eh) {
 }
 
 void checkInsert(ReturnValue_t result, const char* ctx) {
-  if (result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != returnvalue::OK) {
     sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx << std::endl;
   }
 }