diff --git a/src/fsfw/returnvalues/HasReturnvaluesIF.h b/src/fsfw/returnvalues/HasReturnvaluesIF.h
index eec802281..4d59c26b1 100644
--- a/src/fsfw/returnvalues/HasReturnvaluesIF.h
+++ b/src/fsfw/returnvalues/HasReturnvaluesIF.h
@@ -10,11 +10,21 @@
 #define MAKE_RETURN_CODE(number) ((INTERFACE_ID << 8) + (number))
 typedef uint16_t ReturnValue_t;
 
+namespace retval {
+static constexpr ReturnValue_t OK = 0;
+static constexpr ReturnValue_t FAILED = 1;
+
+static constexpr ReturnValue_t makeCode(uint8_t classId, uint8_t number) {
+  return (static_cast<ReturnValue_t>(classId) << 8) + number;
+}
+}  // namespace retval
+
 class HasReturnvaluesIF {
  public:
-  static const ReturnValue_t RETURN_OK = 0;
-  static const ReturnValue_t RETURN_FAILED = 1;
-  virtual ~HasReturnvaluesIF() {}
+  static const ReturnValue_t RETURN_OK = retval::OK;
+  static const ReturnValue_t RETURN_FAILED = retval::FAILED;
+
+  virtual ~HasReturnvaluesIF() = default;
 
   /**
    * It is discouraged to use the input parameters 0,0 and 0,1 as this
@@ -23,8 +33,9 @@ class HasReturnvaluesIF {
    * @param number
    * @return
    */
-  static constexpr ReturnValue_t makeReturnCode(uint8_t classId, uint8_t number) {
-    return (static_cast<ReturnValue_t>(classId) << 8) + number;
+  [[deprecated("Use retval::makeCode instead")]] static constexpr ReturnValue_t makeReturnCode(
+      uint8_t classId, uint8_t number) {
+    return retval::makeCode(classId, number);
   }
 };