diff --git a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
index a9e527f4..0f21548e 100644
--- a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
+++ b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
@@ -9,21 +9,17 @@
 
 namespace acsctrl {
 
-static const uint8_t IF_ACS_CTRL_ID = CLASS_ID::ACS_CTRL;
+static const uint8_t INTERFACE_ID = CLASS_ID::ACS_CTRL;
 //! [EXPORT] : [COMMENT] File deletion failed and at least one file is still existent.
-static constexpr ReturnValue_t FILE_DELETION_FAILED =
-    returnvalue::makeCode(acsctrl::IF_ACS_CTRL_ID, 0);
+static constexpr ReturnValue_t FILE_DELETION_FAILED = MAKE_RETURN_CODE(0xA0);
 //! [EXPORT] : [COMMENT] Writing the TLE to the file has failed.
-static constexpr ReturnValue_t WRITE_FILE_FAILED =
-    returnvalue::makeCode(acsctrl::IF_ACS_CTRL_ID, 1);
+static constexpr ReturnValue_t WRITE_FILE_FAILED = MAKE_RETURN_CODE(0xA1);
 //! [EXPORT] : [COMMENT] Reading the TLE to the file has failed.
-static constexpr ReturnValue_t READ_FILE_FAILED = returnvalue::makeCode(acsctrl::IF_ACS_CTRL_ID, 2);
+static constexpr ReturnValue_t MAKE_RETURN_CODE = MAKE_RETURN_CODE(0xA2);
 //! [EXPORT] : [COMMENT] A single RW has failed.
-static constexpr ReturnValue_t SINGLE_RW_UNAVAILABLE =
-    returnvalue::makeCode(acsctrl::IF_ACS_CTRL_ID, 3);
+static constexpr ReturnValue_t SINGLE_RW_UNAVAILABLE = MAKE_RETURN_CODE(0xA3);
 //! [EXPORT] : [COMMENT] Multiple RWs have failed.
-static constexpr ReturnValue_t MULTIPLE_RW_UNAVAILABLE =
-    returnvalue::makeCode(acsctrl::IF_ACS_CTRL_ID, 4);
+static constexpr ReturnValue_t MULTIPLE_RW_UNAVAILABLE = MAKE_RETURN_CODE(0xA4);
 
 enum SetIds : uint32_t {
   MGM_SENSOR_DATA,