diff --git a/docs/api/returnvalue.rst b/docs/api/returnvalue.rst
index b0d43916..da65c141 100644
--- a/docs/api/returnvalue.rst
+++ b/docs/api/returnvalue.rst
@@ -3,7 +3,7 @@
 Returnvalue API
 ==================
 
-.. doxygenfile:: HasReturnvaluesIF.h
+.. doxygenfile:: returnvalue.h
 
 .. _fwclassids:
 
diff --git a/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h b/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h
index c5d41b7d..622cc49a 100644
--- a/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h
+++ b/misc/defaultcfg/fsfwconfig/pollingsequence/PollingSequenceFactory.h
@@ -1,7 +1,7 @@
 #ifndef POLLINGSEQUENCEFACTORY_H_
 #define POLLINGSEQUENCEFACTORY_H_
 
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 class FixedTimeslotTaskIF;
 
diff --git a/src/fsfw/action/CommandActionHelper.h b/src/fsfw/action/CommandActionHelper.h
index a6ec0ca7..55176e09 100644
--- a/src/fsfw/action/CommandActionHelper.h
+++ b/src/fsfw/action/CommandActionHelper.h
@@ -4,7 +4,7 @@
 #include "ActionMessage.h"
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/objectmanager/ObjectManagerIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serialize/SerializeIF.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"
 
diff --git a/src/fsfw/action/CommandsActionsIF.h b/src/fsfw/action/CommandsActionsIF.h
index 94d9a7c4..a183051d 100644
--- a/src/fsfw/action/CommandsActionsIF.h
+++ b/src/fsfw/action/CommandsActionsIF.h
@@ -3,7 +3,7 @@
 
 #include "CommandActionHelper.h"
 #include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * Interface to separate commanding actions of other objects.
diff --git a/src/fsfw/action/HasActionsIF.h b/src/fsfw/action/HasActionsIF.h
index 45247d1a..29e267a0 100644
--- a/src/fsfw/action/HasActionsIF.h
+++ b/src/fsfw/action/HasActionsIF.h
@@ -5,7 +5,7 @@
 #include "ActionMessage.h"
 #include "SimpleActionHelper.h"
 #include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief
diff --git a/src/fsfw/cfdp/CFDPHandler.h b/src/fsfw/cfdp/CFDPHandler.h
index 6888f9d7..53a8a009 100644
--- a/src/fsfw/cfdp/CFDPHandler.h
+++ b/src/fsfw/cfdp/CFDPHandler.h
@@ -3,7 +3,7 @@
 
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/tcdistribution/CFDPDistributor.h"
 #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
diff --git a/src/fsfw/cfdp/definitions.h b/src/fsfw/cfdp/definitions.h
index b8827f63..7aad21e7 100644
--- a/src/fsfw/cfdp/definitions.h
+++ b/src/fsfw/cfdp/definitions.h
@@ -7,7 +7,7 @@
 #include <cstdint>
 
 #include "fsfw/returnvalues/FwClassIds.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 namespace cfdp {
 
diff --git a/src/fsfw/container/ArrayList.h b/src/fsfw/container/ArrayList.h
index 608e7e55..f5f74cf1 100644
--- a/src/fsfw/container/ArrayList.h
+++ b/src/fsfw/container/ArrayList.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_CONTAINER_ARRAYLIST_H_
 #define FSFW_CONTAINER_ARRAYLIST_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serialize/SerializeAdapter.h"
 #include "../serialize/SerializeIF.h"
 
diff --git a/src/fsfw/container/FIFOBase.h b/src/fsfw/container/FIFOBase.h
index 7c51bc39..bb92790c 100644
--- a/src/fsfw/container/FIFOBase.h
+++ b/src/fsfw/container/FIFOBase.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 template <typename T>
 class FIFOBase {
diff --git a/src/fsfw/container/FixedMap.h b/src/fsfw/container/FixedMap.h
index c6b2c9b5..def219d1 100644
--- a/src/fsfw/container/FixedMap.h
+++ b/src/fsfw/container/FixedMap.h
@@ -4,7 +4,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "ArrayList.h"
 
 /**
diff --git a/src/fsfw/container/IndexedRingMemoryArray.h b/src/fsfw/container/IndexedRingMemoryArray.h
index 4ad72592..127ed5d7 100644
--- a/src/fsfw/container/IndexedRingMemoryArray.h
+++ b/src/fsfw/container/IndexedRingMemoryArray.h
@@ -4,7 +4,7 @@
 #include <cmath>
 
 #include "../globalfunctions/CRC.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serialize/SerialArrayListAdapter.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "ArrayList.h"
diff --git a/src/fsfw/container/RingBufferBase.h b/src/fsfw/container/RingBufferBase.h
index 77a0583b..e86f0ee1 100644
--- a/src/fsfw/container/RingBufferBase.h
+++ b/src/fsfw/container/RingBufferBase.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 template <uint8_t N_READ_PTRS = 1>
 class RingBufferBase {
diff --git a/src/fsfw/coordinates/Sgp4Propagator.h b/src/fsfw/coordinates/Sgp4Propagator.h
index 0edaf459..5cbeb3f2 100644
--- a/src/fsfw/coordinates/Sgp4Propagator.h
+++ b/src/fsfw/coordinates/Sgp4Propagator.h
@@ -7,7 +7,7 @@
 #ifndef PLATFORM_WIN
 #include <sys/time.h>
 #endif
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw_contrib/sgp4/sgp4unit.h"
 
 class Sgp4Propagator {
diff --git a/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h b/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
index 22ff12e4..71d14e60 100644
--- a/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
+++ b/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
@@ -9,12 +9,12 @@
 #define CCSDSRETURNVALUESIF_H_
 
 #include "dllConf.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 /**
  * This is a helper class to collect special return values that come up during CCSDS Handling.
  * @ingroup ccsds_handling
  */
-class CCSDSReturnValuesIF : public HasReturnvaluesIF {
+class CCSDSReturnValuesIF {
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::CCSDS_HANDLER_IF;  //!< Basic ID of the interface.
 
diff --git a/src/fsfw/datalinklayer/MapPacketExtraction.h b/src/fsfw/datalinklayer/MapPacketExtraction.h
index 6586722c..fab7f3c3 100644
--- a/src/fsfw/datalinklayer/MapPacketExtraction.h
+++ b/src/fsfw/datalinklayer/MapPacketExtraction.h
@@ -5,7 +5,7 @@
 #include "dllConf.h"
 #include "fsfw/ipc/MessageQueueSenderIF.h"
 #include "fsfw/objectmanager/ObjectManagerIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class StorageManagerIF;
 
diff --git a/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h b/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h
index 8874909b..9239ee0e 100644
--- a/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h
+++ b/src/fsfw/datalinklayer/VirtualChannelReceptionIF.h
@@ -11,7 +11,7 @@
 #include "ClcwIF.h"
 #include "TcTransferFrame.h"
 #include "dllConf.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * This is the interface for Virtual Channel reception classes.
diff --git a/src/fsfw/datapool/DataSetIF.h b/src/fsfw/datapool/DataSetIF.h
index 492bcf29..3d4be351 100644
--- a/src/fsfw/datapool/DataSetIF.h
+++ b/src/fsfw/datapool/DataSetIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_DATAPOOL_DATASETIF_H_
 #define FSFW_DATAPOOL_DATASETIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../timemanager/Clock.h"
 class PoolVariableIF;
 
diff --git a/src/fsfw/datapool/PoolVariableIF.h b/src/fsfw/datapool/PoolVariableIF.h
index 95cf898e..69074310 100644
--- a/src/fsfw/datapool/PoolVariableIF.h
+++ b/src/fsfw/datapool/PoolVariableIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_DATAPOOL_POOLVARIABLEIF_H_
 #define FSFW_DATAPOOL_POOLVARIABLEIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serialize/SerializeIF.h"
 #include "ReadCommitIF.h"
 
diff --git a/src/fsfw/datapool/ReadCommitIF.h b/src/fsfw/datapool/ReadCommitIF.h
index 08554be1..ca074dec 100644
--- a/src/fsfw/datapool/ReadCommitIF.h
+++ b/src/fsfw/datapool/ReadCommitIF.h
@@ -2,7 +2,7 @@
 #define FSFW_DATAPOOL_READCOMMITIF_H_
 
 #include "../ipc/MutexIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 /**
  * @brief 	Common interface for all software objects which employ read-commit
diff --git a/src/fsfw/datapool/ReadCommitIFAttorney.h b/src/fsfw/datapool/ReadCommitIFAttorney.h
index 361ac6e4..cca76c97 100644
--- a/src/fsfw/datapool/ReadCommitIFAttorney.h
+++ b/src/fsfw/datapool/ReadCommitIFAttorney.h
@@ -2,7 +2,7 @@
 #define FSFW_DATAPOOL_READCOMMITIFATTORNEY_H_
 
 #include <fsfw/datapool/ReadCommitIF.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 /**
  * @brief   This class determines which members are allowed to access protected members
diff --git a/src/fsfw/datapoollocal/LocalPoolObjectBase.h b/src/fsfw/datapoollocal/LocalPoolObjectBase.h
index f454fea3..a4ecbd55 100644
--- a/src/fsfw/datapoollocal/LocalPoolObjectBase.h
+++ b/src/fsfw/datapoollocal/LocalPoolObjectBase.h
@@ -4,7 +4,7 @@
 #include "MarkChangedIF.h"
 #include "fsfw/datapool/PoolVariableIF.h"
 #include "fsfw/objectmanager/SystemObjectIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "localPoolDefinitions.h"
 
 class LocalDataPoolManager;
diff --git a/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h b/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
index 1f13a09d..eb4e55b7 100644
--- a/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
+++ b/src/fsfw/datapoollocal/ProvidesDataPoolSubscriptionIF.h
@@ -2,7 +2,7 @@
 #define FSFW_DATAPOOLLOCAL_PROVIDESDATAPOOLSUBSCRIPTION_H_
 
 #include "../ipc/messageQueueDefinitions.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "localPoolDefinitions.h"
 
 class ProvidesDataPoolSubscriptionIF {
diff --git a/src/fsfw/devicehandlers/DeviceCommunicationIF.h b/src/fsfw/devicehandlers/DeviceCommunicationIF.h
index cf00a8e2..a5546a36 100644
--- a/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+++ b/src/fsfw/devicehandlers/DeviceCommunicationIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_DEVICES_DEVICECOMMUNICATIONIF_H_
 #define FSFW_DEVICES_DEVICECOMMUNICATIONIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "CookieIF.h"
 #include "DeviceHandlerIF.h"
 /**
diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.h b/src/fsfw/devicehandlers/DeviceHandlerBase.h
index a37a4740..a20eae0c 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.h
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.h
@@ -18,7 +18,7 @@
 #include "fsfw/objectmanager/SystemObject.h"
 #include "fsfw/parameters/ParameterHelper.h"
 #include "fsfw/power/PowerSwitchIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
diff --git a/src/fsfw/events/eventmatching/EventMatchTree.h b/src/fsfw/events/eventmatching/EventMatchTree.h
index 7561e27d..0d06f0c2 100644
--- a/src/fsfw/events/eventmatching/EventMatchTree.h
+++ b/src/fsfw/events/eventmatching/EventMatchTree.h
@@ -4,7 +4,7 @@
 #include "../../container/PlacementFactory.h"
 #include "../../events/EventMessage.h"
 #include "../../globalfunctions/matching/MatchTree.h"
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 class StorageManagerIF;
 
 class EventMatchTree : public MatchTree<EventMessage*> {
diff --git a/src/fsfw/fdir/ConfirmsFailuresIF.h b/src/fsfw/fdir/ConfirmsFailuresIF.h
index e4d26907..4424747e 100644
--- a/src/fsfw/fdir/ConfirmsFailuresIF.h
+++ b/src/fsfw/fdir/ConfirmsFailuresIF.h
@@ -2,7 +2,7 @@
 #define FRAMEWORK_FDIR_CONFIRMSFAILURESIF_H_
 
 #include "../ipc/MessageQueueSenderIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class ConfirmsFailuresIF {
  public:
diff --git a/src/fsfw/fdir/FailureIsolationBase.h b/src/fsfw/fdir/FailureIsolationBase.h
index 543d9fca..7ebfa9af 100644
--- a/src/fsfw/fdir/FailureIsolationBase.h
+++ b/src/fsfw/fdir/FailureIsolationBase.h
@@ -5,7 +5,7 @@
 #include "../health/HealthMessage.h"
 #include "../ipc/MessageQueueIF.h"
 #include "../parameters/HasParametersIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "ConfirmsFailuresIF.h"
 #include "FaultCounter.h"
 
diff --git a/src/fsfw/globalfunctions/AsciiConverter.h b/src/fsfw/globalfunctions/AsciiConverter.h
index 7eb28882..e6cd60a7 100644
--- a/src/fsfw/globalfunctions/AsciiConverter.h
+++ b/src/fsfw/globalfunctions/AsciiConverter.h
@@ -1,7 +1,7 @@
 #ifndef ASCIICONVERTER_H_
 #define ASCIICONVERTER_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class AsciiConverter {
  public:
diff --git a/src/fsfw/globalfunctions/DleEncoder.h b/src/fsfw/globalfunctions/DleEncoder.h
index 85656b37..b7242ebe 100644
--- a/src/fsfw/globalfunctions/DleEncoder.h
+++ b/src/fsfw/globalfunctions/DleEncoder.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief   This DLE Encoder (Data Link Encoder) can be used to encode and
diff --git a/src/fsfw/globalfunctions/Type.h b/src/fsfw/globalfunctions/Type.h
index 385d7219..918ba4e8 100644
--- a/src/fsfw/globalfunctions/Type.h
+++ b/src/fsfw/globalfunctions/Type.h
@@ -3,7 +3,7 @@
 
 #include <type_traits>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serialize/SerializeIF.h"
 
 /**
diff --git a/src/fsfw/health/HasHealthIF.h b/src/fsfw/health/HasHealthIF.h
index 41abeef3..77a1c12f 100644
--- a/src/fsfw/health/HasHealthIF.h
+++ b/src/fsfw/health/HasHealthIF.h
@@ -3,7 +3,7 @@
 
 #include "../events/Event.h"
 #include "../ipc/MessageQueueSenderIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class HasHealthIF {
  public:
diff --git a/src/fsfw/health/HealthHelper.h b/src/fsfw/health/HealthHelper.h
index 84985559..6b550f90 100644
--- a/src/fsfw/health/HealthHelper.h
+++ b/src/fsfw/health/HealthHelper.h
@@ -5,7 +5,7 @@
 #include "../events/EventReportingProxyIF.h"
 #include "../ipc/MessageQueueIF.h"
 #include "../objectmanager/ObjectManagerIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "HasHealthIF.h"
 #include "HealthMessage.h"
 #include "HealthTableIF.h"
diff --git a/src/fsfw/health/HealthTableIF.h b/src/fsfw/health/HealthTableIF.h
index aab3f0eb..0b993691 100644
--- a/src/fsfw/health/HealthTableIF.h
+++ b/src/fsfw/health/HealthTableIF.h
@@ -4,7 +4,7 @@
 #include <utility>
 
 #include "../objectmanager/ObjectManagerIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "ManagesHealthIF.h"
 
 class HealthTableIF : public ManagesHealthIF {
diff --git a/src/fsfw/ipc/CommandMessageIF.h b/src/fsfw/ipc/CommandMessageIF.h
index aea08203..dc8f7109 100644
--- a/src/fsfw/ipc/CommandMessageIF.h
+++ b/src/fsfw/ipc/CommandMessageIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_IPC_COMMANDMESSAGEIF_H_
 #define FSFW_IPC_COMMANDMESSAGEIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "FwMessageTypes.h"
 #include "MessageQueueMessageIF.h"
 
diff --git a/src/fsfw/ipc/MessageQueueIF.h b/src/fsfw/ipc/MessageQueueIF.h
index b229747e..4fe8a63b 100644
--- a/src/fsfw/ipc/MessageQueueIF.h
+++ b/src/fsfw/ipc/MessageQueueIF.h
@@ -5,7 +5,7 @@
 
 #include <cstdint>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "MessageQueueMessageIF.h"
 #include "messageQueueDefinitions.h"
 
diff --git a/src/fsfw/ipc/MutexIF.h b/src/fsfw/ipc/MutexIF.h
index 0bdfa1f4..30992f7b 100644
--- a/src/fsfw/ipc/MutexIF.h
+++ b/src/fsfw/ipc/MutexIF.h
@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_IPC_MUTEXIF_H_
 #define FRAMEWORK_IPC_MUTEXIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 /**
  * @brief Common interface for OS Mutex objects which provide MUTual EXclusion.
diff --git a/src/fsfw/memory/HasFileSystemIF.h b/src/fsfw/memory/HasFileSystemIF.h
index 88a7db83..4c081e26 100644
--- a/src/fsfw/memory/HasFileSystemIF.h
+++ b/src/fsfw/memory/HasFileSystemIF.h
@@ -6,7 +6,7 @@
 #include "FileSystemArgsIF.h"
 #include "fsfw/ipc/messageQueueDefinitions.h"
 #include "fsfw/returnvalues/FwClassIds.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief	Generic interface for objects which expose a file system to enable
diff --git a/src/fsfw/memory/HasMemoryIF.h b/src/fsfw/memory/HasMemoryIF.h
index 342f7115..b39032af 100644
--- a/src/fsfw/memory/HasMemoryIF.h
+++ b/src/fsfw/memory/HasMemoryIF.h
@@ -1,7 +1,7 @@
 #ifndef HASMEMORYIF_H_
 #define HASMEMORYIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class HasMemoryIF {
  public:
diff --git a/src/fsfw/memory/MemoryHelper.h b/src/fsfw/memory/MemoryHelper.h
index 3a51f7dc..095b366f 100644
--- a/src/fsfw/memory/MemoryHelper.h
+++ b/src/fsfw/memory/MemoryHelper.h
@@ -3,7 +3,7 @@
 
 #include "../ipc/CommandMessage.h"
 #include "../ipc/MessageQueueIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../storagemanager/StorageManagerIF.h"
 #include "AcceptsMemoryMessagesIF.h"
 
diff --git a/src/fsfw/modes/HasModesIF.h b/src/fsfw/modes/HasModesIF.h
index 03cc45bf..599975f8 100644
--- a/src/fsfw/modes/HasModesIF.h
+++ b/src/fsfw/modes/HasModesIF.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 
 #include "../events/Event.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "ModeHelper.h"
 #include "ModeMessage.h"
 
diff --git a/src/fsfw/modes/ModeHelper.h b/src/fsfw/modes/ModeHelper.h
index 4d0479db..a84408a2 100644
--- a/src/fsfw/modes/ModeHelper.h
+++ b/src/fsfw/modes/ModeHelper.h
@@ -3,7 +3,7 @@
 
 #include "ModeMessage.h"
 #include "fsfw/ipc/MessageQueueIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/timemanager/Countdown.h"
 
 class HasModesIF;
diff --git a/src/fsfw/monitoring/LimitViolationReporter.h b/src/fsfw/monitoring/LimitViolationReporter.h
index 06b3ba74..12747725 100644
--- a/src/fsfw/monitoring/LimitViolationReporter.h
+++ b/src/fsfw/monitoring/LimitViolationReporter.h
@@ -8,7 +8,7 @@
 #define LIMITVIOLATIONREPORTER_H_
 
 #include "../ipc/MessageQueueSenderIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serialize/SerializeIF.h"
 #include "../storagemanager/StorageManagerIF.h"
 #include "monitoringConf.h"
diff --git a/src/fsfw/objectmanager/ObjectManagerIF.h b/src/fsfw/objectmanager/ObjectManagerIF.h
index eae35319..81ddd95a 100644
--- a/src/fsfw/objectmanager/ObjectManagerIF.h
+++ b/src/fsfw/objectmanager/ObjectManagerIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
 #define FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serviceinterface/ServiceInterface.h"
 #include "SystemObjectIF.h"
 #include "frameworkObjects.h"
diff --git a/src/fsfw/objectmanager/SystemObjectIF.h b/src/fsfw/objectmanager/SystemObjectIF.h
index 25065662..490de20b 100644
--- a/src/fsfw/objectmanager/SystemObjectIF.h
+++ b/src/fsfw/objectmanager/SystemObjectIF.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 
 #include "../events/EventReportingProxyIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 /**
  * @defgroup system_objects Software System Object Management
  * The classes to create System Objects and classes to manage these are
diff --git a/src/fsfw/osal/InternalErrorCodes.h b/src/fsfw/osal/InternalErrorCodes.h
index 5924d4c9..abec460f 100644
--- a/src/fsfw/osal/InternalErrorCodes.h
+++ b/src/fsfw/osal/InternalErrorCodes.h
@@ -1,7 +1,7 @@
 #ifndef INTERNALERRORCODES_H_
 #define INTERNALERRORCODES_H_
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class InternalErrorCodes {
  public:
diff --git a/src/fsfw/osal/common/TcpIpBase.h b/src/fsfw/osal/common/TcpIpBase.h
index ccbd12ca..6cc71fbf 100644
--- a/src/fsfw/osal/common/TcpIpBase.h
+++ b/src/fsfw/osal/common/TcpIpBase.h
@@ -2,7 +2,7 @@
 #define FSFW_OSAL_COMMON_TCPIPIF_H_
 
 #include "../../platform.h"
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 
 #ifdef PLATFORM_WIN
 #include <winsock2.h>
diff --git a/src/fsfw/osal/freertos/BinSemaphUsingTask.h b/src/fsfw/osal/freertos/BinSemaphUsingTask.h
index b29ecdc9..480296ee 100644
--- a/src/fsfw/osal/freertos/BinSemaphUsingTask.h
+++ b/src/fsfw/osal/freertos/BinSemaphUsingTask.h
@@ -2,7 +2,7 @@
 #define FSFW_OSAL_FREERTOS_BINSEMAPHUSINGTASK_H_
 
 #include "FreeRTOS.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/SemaphoreIF.h"
 #include "task.h"
 
@@ -20,7 +20,7 @@
  * (for example in the initializeAfterTaskCreation() function) or
  * by calling refreshTaskHandle() with the correct executing task.
  */
-class BinarySemaphoreUsingTask : public SemaphoreIF, public HasReturnvaluesIF {
+class BinarySemaphoreUsingTask : public SemaphoreIF {
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::SEMAPHORE_IF;
 
diff --git a/src/fsfw/osal/freertos/BinarySemaphore.h b/src/fsfw/osal/freertos/BinarySemaphore.h
index d7fbf351..bd1148ec 100644
--- a/src/fsfw/osal/freertos/BinarySemaphore.h
+++ b/src/fsfw/osal/freertos/BinarySemaphore.h
@@ -2,7 +2,7 @@
 #define FSFW_OSAL_FREERTOS_BINARYSEMPAHORE_H_
 
 #include "FreeRTOS.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/SemaphoreIF.h"
 #include "semphr.h"
 
@@ -22,7 +22,7 @@
  * @author 	R. Mueller
  * @ingroup osal
  */
-class BinarySemaphore : public SemaphoreIF, public HasReturnvaluesIF {
+class BinarySemaphore : public SemaphoreIF {
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::SEMAPHORE_IF;
 
diff --git a/src/fsfw/osal/freertos/TaskFactory.cpp b/src/fsfw/osal/freertos/TaskFactory.cpp
index c79a6cf1..688069cf 100644
--- a/src/fsfw/osal/freertos/TaskFactory.cpp
+++ b/src/fsfw/osal/freertos/TaskFactory.cpp
@@ -2,7 +2,7 @@
 
 #include "fsfw/osal/freertos/FixedTimeslotTask.h"
 #include "fsfw/osal/freertos/PeriodicTask.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
 
diff --git a/src/fsfw/osal/freertos/TaskManagement.h b/src/fsfw/osal/freertos/TaskManagement.h
index 825d8865..6dec15cc 100644
--- a/src/fsfw/osal/freertos/TaskManagement.h
+++ b/src/fsfw/osal/freertos/TaskManagement.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 #include "FreeRTOS.h"
 #include "task.h"
 
diff --git a/src/fsfw/osal/host/TaskFactory.cpp b/src/fsfw/osal/host/TaskFactory.cpp
index e9415f5a..0a27241b 100644
--- a/src/fsfw/osal/host/TaskFactory.cpp
+++ b/src/fsfw/osal/host/TaskFactory.cpp
@@ -5,7 +5,7 @@
 #include "fsfw/osal/host/FixedTimeslotTask.h"
 #include "fsfw/osal/host/PeriodicTask.h"
 #include "fsfw/osal/host/taskHelpers.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/tasks/PeriodicTaskIF.h"
 
diff --git a/src/fsfw/osal/host/taskHelpers.h b/src/fsfw/osal/host/taskHelpers.h
index 13a71d16..7d9ff33c 100644
--- a/src/fsfw/osal/host/taskHelpers.h
+++ b/src/fsfw/osal/host/taskHelpers.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_OSAL_HOST_TASKHELPERS_H_
 #define FSFW_OSAL_HOST_TASKHELPERS_H_
 
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <thread>
 
diff --git a/src/fsfw/osal/linux/BinarySemaphore.h b/src/fsfw/osal/linux/BinarySemaphore.h
index c7289712..fe2c0db0 100644
--- a/src/fsfw/osal/linux/BinarySemaphore.h
+++ b/src/fsfw/osal/linux/BinarySemaphore.h
@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_OSAL_LINUX_BINARYSEMPAHORE_H_
 #define FRAMEWORK_OSAL_LINUX_BINARYSEMPAHORE_H_
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 #include "../../tasks/SemaphoreIF.h"
 
 extern "C" {
@@ -17,7 +17,7 @@ extern "C" {
  * @author 	R. Mueller
  * @ingroup osal
  */
-class BinarySemaphore : public SemaphoreIF, public HasReturnvaluesIF {
+class BinarySemaphore : public SemaphoreIF {
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::SEMAPHORE_IF;
 
diff --git a/src/fsfw/osal/linux/PosixThread.h b/src/fsfw/osal/linux/PosixThread.h
index 78fdfa2b..add41bf6 100644
--- a/src/fsfw/osal/linux/PosixThread.h
+++ b/src/fsfw/osal/linux/PosixThread.h
@@ -7,7 +7,7 @@
 
 #include <cstdlib>
 
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 
 class PosixThread {
  public:
diff --git a/src/fsfw/osal/linux/TaskFactory.cpp b/src/fsfw/osal/linux/TaskFactory.cpp
index 2cd4fd67..bacc4311 100644
--- a/src/fsfw/osal/linux/TaskFactory.cpp
+++ b/src/fsfw/osal/linux/TaskFactory.cpp
@@ -2,7 +2,7 @@
 
 #include "fsfw/osal/linux/FixedTimeslotTask.h"
 #include "fsfw/osal/linux/PeriodicPosixTask.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 // TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
diff --git a/src/fsfw/osal/rtems/FixedTimeslotTask.cpp b/src/fsfw/osal/rtems/FixedTimeslotTask.cpp
index 77582d75..c1cc4460 100644
--- a/src/fsfw/osal/rtems/FixedTimeslotTask.cpp
+++ b/src/fsfw/osal/rtems/FixedTimeslotTask.cpp
@@ -6,7 +6,7 @@
 #include <rtems/rtems/types.h>
 
 #include "fsfw/osal/rtems/RtemsBasic.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
diff --git a/src/fsfw/osal/rtems/RtemsBasic.h b/src/fsfw/osal/rtems/RtemsBasic.h
index 3525799c..ea97c3af 100644
--- a/src/fsfw/osal/rtems/RtemsBasic.h
+++ b/src/fsfw/osal/rtems/RtemsBasic.h
@@ -8,7 +8,7 @@
 
 #include <cstddef>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class RtemsBasic {
  public:
diff --git a/src/fsfw/osal/rtems/TaskFactory.cpp b/src/fsfw/osal/rtems/TaskFactory.cpp
index f10e5cf3..4dbd254e 100644
--- a/src/fsfw/osal/rtems/TaskFactory.cpp
+++ b/src/fsfw/osal/rtems/TaskFactory.cpp
@@ -3,7 +3,7 @@
 #include "fsfw/osal/rtems/FixedTimeslotTask.h"
 #include "fsfw/osal/rtems/PeriodicTask.h"
 #include "fsfw/osal/rtems/RtemsBasic.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 // TODO: Different variant than the lazy loading in QueueFactory. What's better and why?
 TaskFactory* TaskFactory::factoryInstance = new TaskFactory();
diff --git a/src/fsfw/parameters/HasParametersIF.h b/src/fsfw/parameters/HasParametersIF.h
index 48557b4a..d586ceba 100644
--- a/src/fsfw/parameters/HasParametersIF.h
+++ b/src/fsfw/parameters/HasParametersIF.h
@@ -3,7 +3,7 @@
 
 #include <cstdint>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "ParameterWrapper.h"
 
 /**
diff --git a/src/fsfw/parameters/ParameterWrapper.h b/src/fsfw/parameters/ParameterWrapper.h
index 5a8e20a4..7767255e 100644
--- a/src/fsfw/parameters/ParameterWrapper.h
+++ b/src/fsfw/parameters/ParameterWrapper.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 
 #include "../globalfunctions/Type.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../serialize/SerializeAdapter.h"
 #include "../serialize/SerializeIF.h"
 
diff --git a/src/fsfw/power/Fuse.h b/src/fsfw/power/Fuse.h
index 1f880f3a..e8b86cfd 100644
--- a/src/fsfw/power/Fuse.h
+++ b/src/fsfw/power/Fuse.h
@@ -7,7 +7,7 @@
 #include "../devicehandlers/HealthDevice.h"
 #include "../monitoring/AbsLimitMonitor.h"
 #include "../parameters/ParameterHelper.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "PowerComponentIF.h"
 #include "PowerSwitchIF.h"
 namespace Factory {
diff --git a/src/fsfw/power/PowerSwitchIF.h b/src/fsfw/power/PowerSwitchIF.h
index 054923f4..e8c9aff4 100644
--- a/src/fsfw/power/PowerSwitchIF.h
+++ b/src/fsfw/power/PowerSwitchIF.h
@@ -2,7 +2,7 @@
 #define FSFW_POWER_POWERSWITCHIF_H_
 
 #include "../events/Event.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "definitions.h"
 /**
  *
@@ -20,7 +20,7 @@ class PowerSwitchIF {
    */
   virtual ~PowerSwitchIF() {}
   /**
-   * The Returnvalues id of this class, required by HasReturnvaluesIF
+   * The Returnvalues id of this class
    */
   static const uint8_t INTERFACE_ID = CLASS_ID::POWER_SWITCH_IF;
   static const ReturnValue_t SWITCH_ON = MAKE_RETURN_CODE(1);
diff --git a/src/fsfw/power/PowerSwitcher.h b/src/fsfw/power/PowerSwitcher.h
index 7aa60494..7a38336c 100644
--- a/src/fsfw/power/PowerSwitcher.h
+++ b/src/fsfw/power/PowerSwitcher.h
@@ -2,7 +2,7 @@
 #define FSFW_POWER_POWERSWITCHER_H_
 
 #include "../objectmanager/SystemObjectIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../timemanager/Countdown.h"
 #include "PowerSwitchIF.h"
 
diff --git a/src/fsfw/pus/Service1TelecommandVerification.h b/src/fsfw/pus/Service1TelecommandVerification.h
index 02a5e513..d921b48c 100644
--- a/src/fsfw/pus/Service1TelecommandVerification.h
+++ b/src/fsfw/pus/Service1TelecommandVerification.h
@@ -3,7 +3,7 @@
 
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/tmtcservices/AcceptsVerifyMessageIF.h"
 #include "fsfw/tmtcservices/PusVerificationReport.h"
diff --git a/src/fsfw/returnvalues/HasReturnvaluesIF.h b/src/fsfw/returnvalues/returnvalue.h
similarity index 81%
rename from src/fsfw/returnvalues/HasReturnvaluesIF.h
rename to src/fsfw/returnvalues/returnvalue.h
index 79a0d9bd..c7927a8d 100644
--- a/src/fsfw/returnvalues/HasReturnvaluesIF.h
+++ b/src/fsfw/returnvalues/returnvalue.h
@@ -1,5 +1,5 @@
-#ifndef FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
-#define FSFW_RETURNVALUES_HASRETURNVALUESIF_H_
+#ifndef FSFW_RETURNVALUES_RETURNVALUE_H_
+#define FSFW_RETURNVALUES_RETURNVALUE_H_
 
 #include <returnvalues/classIds.h>
 
@@ -29,4 +29,4 @@ static constexpr ReturnValue_t makeCode(
 
 }
 
-#endif /* FSFW_RETURNVALUES_HASRETURNVALUESIF_H_ */
+#endif /* FSFW_RETURNVALUES_RETURNVALUE_H_ */
diff --git a/src/fsfw/rmap/RMAP.h b/src/fsfw/rmap/RMAP.h
index d274fb15..df6eaf5e 100644
--- a/src/fsfw/rmap/RMAP.h
+++ b/src/fsfw/rmap/RMAP.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_RMAP_RMAP_H_
 #define FSFW_RMAP_RMAP_H_
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/rmap/RMAPCookie.h"
 #include "rmapConf.h"
 
@@ -36,7 +36,7 @@
  * assignment can be changed at runtime to allow for example redundancy switching. This API is
  * static as the information which channel to use is contained within the cookie.
  */
-class RMAP : public HasReturnvaluesIF {
+class RMAP {
  public:
   static const uint8_t INTERFACE_ID = CLASS_ID::RMAP_CHANNEL;
 
diff --git a/src/fsfw/rmap/RMAPChannelIF.h b/src/fsfw/rmap/RMAPChannelIF.h
index aea08c86..60d439d0 100644
--- a/src/fsfw/rmap/RMAPChannelIF.h
+++ b/src/fsfw/rmap/RMAPChannelIF.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 
 #include "RMAPCookie.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "rmapConf.h"
 
 class RMAPChannelIF {
diff --git a/src/fsfw/serialize/SerializeAdapter.h b/src/fsfw/serialize/SerializeAdapter.h
index cc06aa80..bca0e637 100644
--- a/src/fsfw/serialize/SerializeAdapter.h
+++ b/src/fsfw/serialize/SerializeAdapter.h
@@ -4,7 +4,7 @@
 #include <cstddef>
 #include <type_traits>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "EndianConverter.h"
 #include "SerializeIF.h"
 
diff --git a/src/fsfw/serialize/SerializeIF.h b/src/fsfw/serialize/SerializeIF.h
index 0e9840eb..85c29827 100644
--- a/src/fsfw/serialize/SerializeIF.h
+++ b/src/fsfw/serialize/SerializeIF.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @defgroup serialize Serialization
diff --git a/src/fsfw/serviceinterface/ServiceInterfaceBuffer.h b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.h
index 9cda75c6..2ecf88d8 100644
--- a/src/fsfw/serviceinterface/ServiceInterfaceBuffer.h
+++ b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.h
@@ -3,7 +3,7 @@
 
 #include <FSFWConfig.h>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 
diff --git a/src/fsfw/storagemanager/ConstStorageAccessor.h b/src/fsfw/storagemanager/ConstStorageAccessor.h
index a2ddad6c..9cad346c 100644
--- a/src/fsfw/storagemanager/ConstStorageAccessor.h
+++ b/src/fsfw/storagemanager/ConstStorageAccessor.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "storeAddress.h"
 
 class StorageManagerIF;
diff --git a/src/fsfw/storagemanager/StorageManagerIF.h b/src/fsfw/storagemanager/StorageManagerIF.h
index 66002ca9..4041c84b 100644
--- a/src/fsfw/storagemanager/StorageManagerIF.h
+++ b/src/fsfw/storagemanager/StorageManagerIF.h
@@ -5,7 +5,7 @@
 #include <utility>
 
 #include "../events/Event.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "StorageAccessor.h"
 #include "storeAddress.h"
 
diff --git a/src/fsfw/subsystem/SubsystemBase.h b/src/fsfw/subsystem/SubsystemBase.h
index f61340ac..6db9efa5 100644
--- a/src/fsfw/subsystem/SubsystemBase.h
+++ b/src/fsfw/subsystem/SubsystemBase.h
@@ -9,7 +9,7 @@
 #include "../ipc/MessageQueueIF.h"
 #include "../modes/HasModesIF.h"
 #include "../objectmanager/SystemObject.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../tasks/ExecutableObjectIF.h"
 #include "modes/HasModeSequenceIF.h"
 
diff --git a/src/fsfw/subsystem/modes/ModeStoreIF.h b/src/fsfw/subsystem/modes/ModeStoreIF.h
index 79215971..3d56f992 100644
--- a/src/fsfw/subsystem/modes/ModeStoreIF.h
+++ b/src/fsfw/subsystem/modes/ModeStoreIF.h
@@ -7,7 +7,7 @@
 
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"
-#include "../../returnvalues/HasReturnvaluesIF.h"
+#include "../../returnvalues/returnvalue.h"
 #include "ModeDefinitions.h"
 
 class ModeStoreIF {
diff --git a/src/fsfw/tasks/ExecutableObjectIF.h b/src/fsfw/tasks/ExecutableObjectIF.h
index 60f38259..1e3f19e4 100644
--- a/src/fsfw/tasks/ExecutableObjectIF.h
+++ b/src/fsfw/tasks/ExecutableObjectIF.h
@@ -5,7 +5,7 @@ class PeriodicTaskIF;
 
 #include <cstring>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 /**
  * @brief	The interface provides a method to execute objects within a task.
  * @details	The performOperation method, that is required by the interface is
diff --git a/src/fsfw/tasks/SemaphoreIF.h b/src/fsfw/tasks/SemaphoreIF.h
index 37275529..9a692e9b 100644
--- a/src/fsfw/tasks/SemaphoreIF.h
+++ b/src/fsfw/tasks/SemaphoreIF.h
@@ -3,7 +3,7 @@
 #include <cstdint>
 
 #include "../returnvalues/FwClassIds.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 /**
  * @brief 	Generic interface for semaphores, which can be used to achieve
diff --git a/src/fsfw/tcdistribution/CFDPDistributor.h b/src/fsfw/tcdistribution/CFDPDistributor.h
index 2a901021..18c139ff 100644
--- a/src/fsfw/tcdistribution/CFDPDistributor.h
+++ b/src/fsfw/tcdistribution/CFDPDistributor.h
@@ -3,7 +3,7 @@
 
 #include <fsfw/tcdistribution/TcPacketCheckCFDP.h>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "../tmtcpacket/cfdp/CFDPPacketStored.h"
 #include "../tmtcservices/AcceptsTelecommandsIF.h"
 #include "../tmtcservices/VerificationReporter.h"
diff --git a/src/fsfw/tcdistribution/PUSDistributor.h b/src/fsfw/tcdistribution/PUSDistributor.h
index c069c81b..8cef0f46 100644
--- a/src/fsfw/tcdistribution/PUSDistributor.h
+++ b/src/fsfw/tcdistribution/PUSDistributor.h
@@ -4,7 +4,7 @@
 #include "PUSDistributorIF.h"
 #include "TcDistributor.h"
 #include "TcPacketCheckPUS.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tmtcpacket/pus/tc.h"
 #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
 #include "fsfw/tmtcservices/VerificationReporter.h"
diff --git a/src/fsfw/tcdistribution/TcDistributor.h b/src/fsfw/tcdistribution/TcDistributor.h
index 62cd5dc9..d018cad4 100644
--- a/src/fsfw/tcdistribution/TcDistributor.h
+++ b/src/fsfw/tcdistribution/TcDistributor.h
@@ -6,7 +6,7 @@
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/objectmanager/ObjectManagerIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/tmtcservices/TmTcMessage.h"
diff --git a/src/fsfw/tcdistribution/TcPacketCheckIF.h b/src/fsfw/tcdistribution/TcPacketCheckIF.h
index 4846195a..e583cb0f 100644
--- a/src/fsfw/tcdistribution/TcPacketCheckIF.h
+++ b/src/fsfw/tcdistribution/TcPacketCheckIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_TCDISTRIBUTION_TCPACKETCHECKIF_H_
 #define FSFW_TCDISTRIBUTION_TCPACKETCHECKIF_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class SpacePacketBase;
 
diff --git a/src/fsfw/tcdistribution/TcPacketCheckPUS.h b/src/fsfw/tcdistribution/TcPacketCheckPUS.h
index 5b02bbc0..1ecd1007 100644
--- a/src/fsfw/tcdistribution/TcPacketCheckPUS.h
+++ b/src/fsfw/tcdistribution/TcPacketCheckPUS.h
@@ -3,7 +3,7 @@
 
 #include "TcPacketCheckIF.h"
 #include "fsfw/FSFW.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tmtcservices/PusVerificationReport.h"
 
 class TcPacketStoredBase;
diff --git a/src/fsfw/thermal/Heater.h b/src/fsfw/thermal/Heater.h
index 61d3776f..d535f54a 100644
--- a/src/fsfw/thermal/Heater.h
+++ b/src/fsfw/thermal/Heater.h
@@ -6,7 +6,7 @@
 #include "fsfw/devicehandlers/HealthDevice.h"
 #include "fsfw/parameters/ParameterHelper.h"
 #include "fsfw/power/PowerSwitchIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/timemanager/Countdown.h"
 
 class Heater : public HealthDevice, public ReceivesParameterMessagesIF {
diff --git a/src/fsfw/thermal/ThermalComponentIF.h b/src/fsfw/thermal/ThermalComponentIF.h
index 0c50fbad..0ab22d85 100644
--- a/src/fsfw/thermal/ThermalComponentIF.h
+++ b/src/fsfw/thermal/ThermalComponentIF.h
@@ -4,7 +4,7 @@
 #include "../events/Event.h"
 #include "../objectmanager/SystemObjectIF.h"
 #include "../parameters/HasParametersIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 class ThermalComponentIF : public HasParametersIF {
  public:
diff --git a/src/fsfw/timemanager/CCSDSTime.h b/src/fsfw/timemanager/CCSDSTime.h
index 622f42ec..c52d7e87 100644
--- a/src/fsfw/timemanager/CCSDSTime.h
+++ b/src/fsfw/timemanager/CCSDSTime.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 #include "Clock.h"
 #include "clockDefinitions.h"
 
diff --git a/src/fsfw/timemanager/Clock.h b/src/fsfw/timemanager/Clock.h
index f27c2211..88436b8b 100644
--- a/src/fsfw/timemanager/Clock.h
+++ b/src/fsfw/timemanager/Clock.h
@@ -6,7 +6,7 @@
 #include "clockDefinitions.h"
 #include "fsfw/globalfunctions/timevalOperations.h"
 #include "fsfw/ipc/MutexFactory.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 #ifdef WIN32
 #include <winsock2.h>
diff --git a/src/fsfw/timemanager/TimeStamperIF.h b/src/fsfw/timemanager/TimeStamperIF.h
index 5c3880ea..92577943 100644
--- a/src/fsfw/timemanager/TimeStamperIF.h
+++ b/src/fsfw/timemanager/TimeStamperIF.h
@@ -3,7 +3,7 @@
 
 #include <FSFWConfig.h>
 
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../returnvalues/returnvalue.h"
 
 /**
  * A class implementing this IF provides facilities to add a time stamp to the
diff --git a/src/fsfw/tmstorage/TmStoreBackendIF.h b/src/fsfw/tmstorage/TmStoreBackendIF.h
index d9f1a17b..84c94f77 100644
--- a/src/fsfw/tmstorage/TmStoreBackendIF.h
+++ b/src/fsfw/tmstorage/TmStoreBackendIF.h
@@ -3,7 +3,7 @@
 
 #include "fsfw/objectmanager/SystemObjectIF.h"
 #include "fsfw/parameters/HasParametersIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"
 #include "fsfw/timemanager/Clock.h"
 #include "tmStorageConf.h"
diff --git a/src/fsfw/tmstorage/TmStoreFrontendIF.h b/src/fsfw/tmstorage/TmStoreFrontendIF.h
index 4665a299..56bcd7fa 100644
--- a/src/fsfw/tmstorage/TmStoreFrontendIF.h
+++ b/src/fsfw/tmstorage/TmStoreFrontendIF.h
@@ -3,7 +3,7 @@
 
 #include "TmStorePackets.h"
 #include "fsfw/ipc/MessageQueueSenderIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "tmStorageConf.h"
 
 class TmPacketMinimal;
diff --git a/src/fsfw/tmtcpacket/RedirectableDataPointerIF.h b/src/fsfw/tmtcpacket/RedirectableDataPointerIF.h
index 1a74e63d..13eec711 100644
--- a/src/fsfw/tmtcpacket/RedirectableDataPointerIF.h
+++ b/src/fsfw/tmtcpacket/RedirectableDataPointerIF.h
@@ -3,7 +3,7 @@
 
 #include <cstddef>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief   This interface can be used for classes which store a reference to data. It allows
diff --git a/src/fsfw/tmtcpacket/SpacePacketBase.h b/src/fsfw/tmtcpacket/SpacePacketBase.h
index d9ee2b83..f3d3dbc6 100644
--- a/src/fsfw/tmtcpacket/SpacePacketBase.h
+++ b/src/fsfw/tmtcpacket/SpacePacketBase.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 
 #include "ccsds_header.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @defgroup tmtcpackets Space Packets
diff --git a/src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h b/src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h
index 340f7825..87517fb6 100644
--- a/src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h
+++ b/src/fsfw/tmtcpacket/pus/PacketTimestampInterpreterIF.h
@@ -1,7 +1,7 @@
 #ifndef FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
 #define FSFW_TMTCPACKET_PUS_PACKETTIMESTAMPINTERPRETERIF_H_
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class TmPacketMinimal;
 
diff --git a/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h
index e7c4f9f0..3cfba870 100644
--- a/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h
+++ b/src/fsfw/tmtcpacket/pus/tc/TcPacketStoredIF.h
@@ -4,7 +4,7 @@
 #include <fsfw/tmtcpacket/RedirectableDataPointerIF.h>
 
 #include "TcPacketPusBase.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/storagemanager/storeAddress.h"
 
 class TcPacketStoredIF {
diff --git a/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h b/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h
index dc9c33ae..581d5dfa 100644
--- a/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h
+++ b/src/fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h
@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_TMTCPACKET_PUS_TMPACKETMINIMAL_H_
 #define FRAMEWORK_TMTCPACKET_PUS_TMPACKETMINIMAL_H_
 
-#include "../../../returnvalues/HasReturnvaluesIF.h"
+#include "../../../returnvalues/returnvalue.h"
 #include "../../SpacePacketBase.h"
 
 struct timeval;
diff --git a/src/fsfw/tmtcservices/PusServiceBase.h b/src/fsfw/tmtcservices/PusServiceBase.h
index 97351994..d7a2ee47 100644
--- a/src/fsfw/tmtcservices/PusServiceBase.h
+++ b/src/fsfw/tmtcservices/PusServiceBase.h
@@ -7,7 +7,7 @@
 #include "fsfw/ipc/MessageQueueIF.h"
 #include "fsfw/objectmanager/ObjectManagerIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw/tmtcpacket/pus/tc.h"
 
diff --git a/src/fsfw/tmtcservices/PusVerificationReport.h b/src/fsfw/tmtcservices/PusVerificationReport.h
index 60c01d55..4f5302f1 100644
--- a/src/fsfw/tmtcservices/PusVerificationReport.h
+++ b/src/fsfw/tmtcservices/PusVerificationReport.h
@@ -3,7 +3,7 @@
 
 #include "VerificationCodes.h"
 #include "fsfw/ipc/MessageQueueMessage.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tmtcpacket/pus/tc/TcPacketPusBase.h"
 
 class PusVerificationMessage : public MessageQueueMessage {
diff --git a/src/fsfw_hal/common/gpio/GpioCookie.h b/src/fsfw_hal/common/gpio/GpioCookie.h
index cf836eae..709af9a5 100644
--- a/src/fsfw_hal/common/gpio/GpioCookie.h
+++ b/src/fsfw_hal/common/gpio/GpioCookie.h
@@ -2,7 +2,7 @@
 #define COMMON_GPIO_GPIOCOOKIE_H_
 
 #include <fsfw/devicehandlers/CookieIF.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include "GpioIF.h"
 #include "gpioDefinitions.h"
diff --git a/src/fsfw_hal/common/gpio/GpioIF.h b/src/fsfw_hal/common/gpio/GpioIF.h
index 3e947b84..a8abb126 100644
--- a/src/fsfw_hal/common/gpio/GpioIF.h
+++ b/src/fsfw_hal/common/gpio/GpioIF.h
@@ -2,7 +2,7 @@
 #define COMMON_GPIO_GPIOIF_H_
 
 #include <fsfw/devicehandlers/CookieIF.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include "gpioDefinitions.h"
 
diff --git a/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp b/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
index 24e90c9f..86c6e888 100644
--- a/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
+++ b/src/fsfw_hal/devicehandlers/MgmRM3100Handler.cpp
@@ -4,7 +4,7 @@
 #include "fsfw/devicehandlers/DeviceHandlerMessage.h"
 #include "fsfw/globalfunctions/bitutility.h"
 #include "fsfw/objectmanager/SystemObjectIF.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 MgmRM3100Handler::MgmRM3100Handler(object_id_t objectId, object_id_t deviceCommunication,
                                    CookieIF *comCookie, uint32_t transitionDelay)
diff --git a/src/fsfw_hal/linux/CommandExecutor.h b/src/fsfw_hal/linux/CommandExecutor.h
index 11b8ccbb..fea2ef0a 100644
--- a/src/fsfw_hal/linux/CommandExecutor.h
+++ b/src/fsfw_hal/linux/CommandExecutor.h
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "fsfw/returnvalues/FwClassIds.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class SimpleRingBuffer;
 template <typename T>
diff --git a/src/fsfw_hal/linux/UnixFileGuard.h b/src/fsfw_hal/linux/UnixFileGuard.h
index 1fe47116..3e4ddca8 100644
--- a/src/fsfw_hal/linux/UnixFileGuard.h
+++ b/src/fsfw_hal/linux/UnixFileGuard.h
@@ -2,7 +2,7 @@
 #define LINUX_UTILITY_UNIXFILEGUARD_H_
 
 #include <fcntl.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 #include <unistd.h>
 
 #include <string>
diff --git a/src/fsfw_hal/linux/rpi/GpioRPi.h b/src/fsfw_hal/linux/rpi/GpioRPi.h
index 8ca7065a..bec4c33d 100644
--- a/src/fsfw_hal/linux/rpi/GpioRPi.h
+++ b/src/fsfw_hal/linux/rpi/GpioRPi.h
@@ -1,7 +1,7 @@
 #ifndef BSP_RPI_GPIO_GPIORPI_H_
 #define BSP_RPI_GPIO_GPIORPI_H_
 
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include "../../common/gpio/gpioDefinitions.h"
 
diff --git a/src/fsfw_hal/linux/spi/spiDefinitions.h b/src/fsfw_hal/linux/spi/spiDefinitions.h
index b4bae3c2..113f6551 100644
--- a/src/fsfw_hal/linux/spi/spiDefinitions.h
+++ b/src/fsfw_hal/linux/spi/spiDefinitions.h
@@ -7,7 +7,7 @@
 
 #include "../../common/gpio/gpioDefinitions.h"
 #include "../../common/spi/spiCommon.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 class SpiCookie;
 class SpiComIF;
diff --git a/src/fsfw_hal/linux/uio/UioMapper.h b/src/fsfw_hal/linux/uio/UioMapper.h
index 20c90b4d..89c2c66a 100644
--- a/src/fsfw_hal/linux/uio/UioMapper.h
+++ b/src/fsfw_hal/linux/uio/UioMapper.h
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief   Class to help opening uio device files and mapping the physical addresses into the user
diff --git a/src/fsfw_hal/stm32h7/devicetest/GyroL3GD20H.h b/src/fsfw_hal/stm32h7/devicetest/GyroL3GD20H.h
index a0c3748a..f967c8d1 100644
--- a/src/fsfw_hal/stm32h7/devicetest/GyroL3GD20H.h
+++ b/src/fsfw_hal/stm32h7/devicetest/GyroL3GD20H.h
@@ -6,7 +6,7 @@
 
 #include "../spi/mspInit.h"
 #include "../spi/spiDefinitions.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "stm32h7xx_hal.h"
 #include "stm32h7xx_hal_spi.h"
 
diff --git a/src/fsfw_hal/stm32h7/spi/spiDefinitions.h b/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
index 809f5c74..55a74e7a 100644
--- a/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
+++ b/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
@@ -3,7 +3,7 @@
 
 #include "../../common/spi/spiCommon.h"
 #include "fsfw/returnvalues/FwClassIds.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "stm32h7xx_hal.h"
 #include "stm32h7xx_hal_spi.h"
 
diff --git a/src/fsfw_tests/integration/task/TestTask.h b/src/fsfw_tests/integration/task/TestTask.h
index 038355c3..40eb4afd 100644
--- a/src/fsfw_tests/integration/task/TestTask.h
+++ b/src/fsfw_tests/integration/task/TestTask.h
@@ -11,7 +11,7 @@
  * @details
  * Should not be used for board specific tests. Instead, a derived board test class should be used.
  */
-class TestTask : public SystemObject, public ExecutableObjectIF, public HasReturnvaluesIF {
+class TestTask : public SystemObject, public ExecutableObjectIF {
  public:
   explicit TestTask(object_id_t objectId);
   ~TestTask() override;
diff --git a/src/fsfw_tests/internal/InternalUnitTester.h b/src/fsfw_tests/internal/InternalUnitTester.h
index 07744825..89bac368 100644
--- a/src/fsfw_tests/internal/InternalUnitTester.h
+++ b/src/fsfw_tests/internal/InternalUnitTester.h
@@ -2,7 +2,7 @@
 #define FRAMEWORK_TEST_UNITTESTCLASS_H_
 
 #include "UnittDefinitions.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 /**
  * @brief	Can be used for internal testing, for example for hardware specific
diff --git a/src/fsfw_tests/internal/UnittDefinitions.h b/src/fsfw_tests/internal/UnittDefinitions.h
index 11e83d22..4517d94e 100644
--- a/src/fsfw_tests/internal/UnittDefinitions.h
+++ b/src/fsfw_tests/internal/UnittDefinitions.h
@@ -5,7 +5,7 @@
 #include <cstdint>
 #include <string>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
 namespace tv {
diff --git a/src/fsfw_tests/internal/serialize/IntTestSerialization.h b/src/fsfw_tests/internal/serialize/IntTestSerialization.h
index 2f1786d4..939b6614 100644
--- a/src/fsfw_tests/internal/serialize/IntTestSerialization.h
+++ b/src/fsfw_tests/internal/serialize/IntTestSerialization.h
@@ -3,7 +3,7 @@
 
 #include <array>
 
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 
 namespace testserialize {
 ReturnValue_t test_serialization();
diff --git a/unittests/CatchDefinitions.h b/unittests/CatchDefinitions.h
index dbe3848b..64a72f57 100644
--- a/unittests/CatchDefinitions.h
+++ b/unittests/CatchDefinitions.h
@@ -2,7 +2,7 @@
 #define FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
 
 #include <fsfw/ipc/messageQueueDefinitions.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw/storagemanager/StorageManagerIF.h>
 
 namespace tconst {
diff --git a/unittests/container/TestArrayList.cpp b/unittests/container/TestArrayList.cpp
index e2f14e47..3056c288 100644
--- a/unittests/container/TestArrayList.cpp
+++ b/unittests/container/TestArrayList.cpp
@@ -1,5 +1,5 @@
 #include <fsfw/container/ArrayList.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestDynamicFifo.cpp b/unittests/container/TestDynamicFifo.cpp
index a3347215..445d3d91 100644
--- a/unittests/container/TestDynamicFifo.cpp
+++ b/unittests/container/TestDynamicFifo.cpp
@@ -1,6 +1,6 @@
 #include <fsfw/container/DynamicFIFO.h>
 #include <fsfw/container/FIFO.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestFifo.cpp b/unittests/container/TestFifo.cpp
index 1a3c9d8a..9fc9ee93 100644
--- a/unittests/container/TestFifo.cpp
+++ b/unittests/container/TestFifo.cpp
@@ -1,6 +1,6 @@
 #include <fsfw/container/DynamicFIFO.h>
 #include <fsfw/container/FIFO.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestFixedArrayList.cpp b/unittests/container/TestFixedArrayList.cpp
index b28c3166..0a8de39f 100644
--- a/unittests/container/TestFixedArrayList.cpp
+++ b/unittests/container/TestFixedArrayList.cpp
@@ -1,5 +1,5 @@
 #include <fsfw/container/FixedArrayList.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestFixedMap.cpp b/unittests/container/TestFixedMap.cpp
index d17cc55b..dae40d2d 100644
--- a/unittests/container/TestFixedMap.cpp
+++ b/unittests/container/TestFixedMap.cpp
@@ -1,5 +1,5 @@
 #include <fsfw/container/FixedMap.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestFixedOrderedMultimap.cpp b/unittests/container/TestFixedOrderedMultimap.cpp
index 153144cd..9bfd2b09 100644
--- a/unittests/container/TestFixedOrderedMultimap.cpp
+++ b/unittests/container/TestFixedOrderedMultimap.cpp
@@ -1,5 +1,5 @@
 #include <fsfw/container/FixedOrderedMultimap.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 #include <catch2/catch_test_macros.hpp>
 
diff --git a/unittests/container/TestPlacementFactory.cpp b/unittests/container/TestPlacementFactory.cpp
index 142f03d7..a898f4c1 100644
--- a/unittests/container/TestPlacementFactory.cpp
+++ b/unittests/container/TestPlacementFactory.cpp
@@ -1,6 +1,6 @@
 #include <fsfw/container/ArrayList.h>
 #include <fsfw/container/PlacementFactory.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw/storagemanager/LocalPool.h>
 
 #include <catch2/catch_test_macros.hpp>
diff --git a/unittests/devicehandler/DeviceHandlerCommander.h b/unittests/devicehandler/DeviceHandlerCommander.h
index e90cbcee..62713d54 100644
--- a/unittests/devicehandler/DeviceHandlerCommander.h
+++ b/unittests/devicehandler/DeviceHandlerCommander.h
@@ -4,7 +4,7 @@
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"
 #include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 
 class DeviceHandlerCommander : public ExecutableObjectIF,
diff --git a/unittests/testcfg/pollingsequence/PollingSequenceFactory.h b/unittests/testcfg/pollingsequence/PollingSequenceFactory.h
index fc9891b2..daba33a8 100644
--- a/unittests/testcfg/pollingsequence/PollingSequenceFactory.h
+++ b/unittests/testcfg/pollingsequence/PollingSequenceFactory.h
@@ -1,7 +1,7 @@
 #ifndef POLLINGSEQUENCEFACTORY_H_
 #define POLLINGSEQUENCEFACTORY_H_
 
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include <fsfw/returnvalues/returnvalue.h>
 
 class FixedTimeslotTaskIF;