diff --git a/fsfwgen/returnvalues/returnvalues_parser.py b/fsfwgen/returnvalues/returnvalues_parser.py
index b34d37c..d93e0d0 100644
--- a/fsfwgen/returnvalues/returnvalues_parser.py
+++ b/fsfwgen/returnvalues/returnvalues_parser.py
@@ -252,7 +252,7 @@ class ReturnValueParser(FileParser):
                     name="OK",
                     description="System-wide code for ok.",
                     unique_id=0,
-                    file_name=Path("fsfw/returnvalues/HasReturnvaluesIF.h"),
+                    file_name=Path("fsfw/returnvalues/returnvalue.h"),
                     subsystem_name="HasReturnvaluesIF",
                 )
             }
@@ -263,7 +263,7 @@ class ReturnValueParser(FileParser):
                     name="Failed",
                     description="Unspecified system-wide code for failed.",
                     unique_id=1,
-                    file_name=Path("fsfw/returnvalues/HasReturnvaluesIF.h"),
+                    file_name=Path("fsfw/returnvalues/returnvalue.h"),
                     subsystem_name="HasReturnvaluesIF",
                 )
             }
@@ -320,7 +320,7 @@ class ReturnValueParser(FileParser):
         number_match = INVALID_IF_ID
         # Try to match for a string using the new API first. Example:
         # static const ReturnValue_t PACKET_TOO_LONG =
-        #       HasReturnvaluesIF::makeReturnCode(CLASS_ID, 0);
+        #       returnvalue::makeCode(CLASS_ID, 0);
         returnvalue_match = re.search(
             r"^[\s]*static const(?:expr)? ReturnValue_t[\s]*([\w]*)[\s]*"
             r"=[\s]*.*::[\w]*\(([\w]*),[\s]*([\d]*)\)",