diff --git a/src/fsfw/datalinklayer/Clcw.cpp b/src/fsfw/datalinklayer/Clcw.cpp
index 6e40df12..4e3dd2e1 100644
--- a/src/fsfw/datalinklayer/Clcw.cpp
+++ b/src/fsfw/datalinklayer/Clcw.cpp
@@ -1,6 +1,6 @@
 #include "fsfw/datalinklayer/Clcw.h"
 
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 Clcw::Clcw() {
   content.raw = 0;
diff --git a/src/fsfw/datalinklayer/DataLinkLayer.cpp b/src/fsfw/datalinklayer/DataLinkLayer.cpp
index ca607478..3aa9ee39 100644
--- a/src/fsfw/datalinklayer/DataLinkLayer.cpp
+++ b/src/fsfw/datalinklayer/DataLinkLayer.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/datalinklayer/DataLinkLayer.h"
 
 #include "fsfw/globalfunctions/CRC.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw,
                              uint8_t set_start_sequence_length, uint16_t set_scid)
diff --git a/src/fsfw/datalinklayer/MapPacketExtraction.cpp b/src/fsfw/datalinklayer/MapPacketExtraction.cpp
index 57aa2f08..fcf5a9fe 100644
--- a/src/fsfw/datalinklayer/MapPacketExtraction.cpp
+++ b/src/fsfw/datalinklayer/MapPacketExtraction.cpp
@@ -4,7 +4,7 @@
 
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager/ObjectManager.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 #include "fsfw/storagemanager/StorageManagerIF.h"
 #include "fsfw/tmtcpacket/SpacePacketBase.h"
 #include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
diff --git a/src/fsfw/datalinklayer/TcTransferFrame.cpp b/src/fsfw/datalinklayer/TcTransferFrame.cpp
index ebf0f38c..6677e2ce 100644
--- a/src/fsfw/datalinklayer/TcTransferFrame.cpp
+++ b/src/fsfw/datalinklayer/TcTransferFrame.cpp
@@ -1,6 +1,6 @@
 #include "fsfw/datalinklayer/TcTransferFrame.h"
 
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 TcTransferFrame::TcTransferFrame() { frame = nullptr; }
 
diff --git a/src/fsfw/datalinklayer/TcTransferFrameLocal.cpp b/src/fsfw/datalinklayer/TcTransferFrameLocal.cpp
index 572f27fd..51aef0e0 100644
--- a/src/fsfw/datalinklayer/TcTransferFrameLocal.cpp
+++ b/src/fsfw/datalinklayer/TcTransferFrameLocal.cpp
@@ -3,7 +3,7 @@
 #include <cstring>
 
 #include "fsfw/globalfunctions/CRC.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,
                                            uint8_t vcId, uint8_t sequenceNumber,
diff --git a/src/fsfw/datalinklayer/VirtualChannelReception.cpp b/src/fsfw/datalinklayer/VirtualChannelReception.cpp
index 258bc1e6..3a8da228 100644
--- a/src/fsfw/datalinklayer/VirtualChannelReception.cpp
+++ b/src/fsfw/datalinklayer/VirtualChannelReception.cpp
@@ -8,7 +8,7 @@
 #include "fsfw/datalinklayer/VirtualChannelReception.h"
 
 #include "fsfw/datalinklayer/BCFrame.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
                                                  uint8_t setSlidingWindowWidth)
diff --git a/src/fsfw/osal/freertos/BinSemaphUsingTask.cpp b/src/fsfw/osal/freertos/BinSemaphUsingTask.cpp
index 7ffd61d3..b98a0a30 100644
--- a/src/fsfw/osal/freertos/BinSemaphUsingTask.cpp
+++ b/src/fsfw/osal/freertos/BinSemaphUsingTask.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/osal/freertos/BinSemaphUsingTask.h"
 
 #include "fsfw/osal/freertos/TaskManagement.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8
 
diff --git a/src/fsfw/osal/freertos/BinarySemaphore.cpp b/src/fsfw/osal/freertos/BinarySemaphore.cpp
index 6e53380c..c4e12efc 100644
--- a/src/fsfw/osal/freertos/BinarySemaphore.cpp
+++ b/src/fsfw/osal/freertos/BinarySemaphore.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/osal/freertos/BinarySemaphore.h"
 
 #include "fsfw/osal/freertos/TaskManagement.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 BinarySemaphore::BinarySemaphore() {
   handle = xSemaphoreCreateBinary();
diff --git a/src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp b/src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp
index 0e4d967d..28d4f703 100644
--- a/src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp
+++ b/src/fsfw/osal/freertos/CountingSemaphUsingTask.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
 
 #include "fsfw/osal/freertos/TaskManagement.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 #if (tskKERNEL_VERSION_MAJOR == 8 && tskKERNEL_VERSION_MINOR > 2) || tskKERNEL_VERSION_MAJOR > 8
 
diff --git a/src/fsfw/osal/freertos/CountingSemaphore.cpp b/src/fsfw/osal/freertos/CountingSemaphore.cpp
index 3137166a..c0c35970 100644
--- a/src/fsfw/osal/freertos/CountingSemaphore.cpp
+++ b/src/fsfw/osal/freertos/CountingSemaphore.cpp
@@ -2,7 +2,7 @@
 
 #include "FreeRTOS.h"
 #include "fsfw/osal/freertos/TaskManagement.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 #include "semphr.h"
 
 // Make sure #define configUSE_COUNTING_SEMAPHORES 1 is set in
diff --git a/src/fsfw/osal/freertos/FixedTimeslotTask.cpp b/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
index e0e3779e..86cb2734 100644
--- a/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
+++ b/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/osal/freertos/FixedTimeslotTask.h"
 
 #include "fsfw/objectmanager/ObjectManager.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 uint32_t FixedTimeslotTask::deadlineMissedCount = 0;
 const size_t PeriodicTaskIF::MINIMUM_STACK_SIZE = configMINIMAL_STACK_SIZE;
diff --git a/src/fsfw/osal/freertos/MessageQueue.cpp b/src/fsfw/osal/freertos/MessageQueue.cpp
index d1a7f691..5489f9ca 100644
--- a/src/fsfw/osal/freertos/MessageQueue.cpp
+++ b/src/fsfw/osal/freertos/MessageQueue.cpp
@@ -2,7 +2,7 @@
 
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/osal/freertos/QueueMapManager.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize, MqArgs* args)
     : MessageQueueBase(MessageQueueIF::NO_QUEUE, MessageQueueIF::NO_QUEUE, args),
@@ -14,9 +14,10 @@ MessageQueue::MessageQueue(size_t messageDepth, size_t maxMessageSize, MqArgs* a
     sif::error << "Specified Message Depth: " << messageDepth << std::endl;
     sif::error << "Specified Maximum Message Size: " << maxMessageSize << std::endl;
 #else
-    sif::printError("MessageQueue::MessageQueue: Creation failed\n");
-    sif::printError("Specified Message Depth: %d\n", messageDepth);
-    sif::printError("Specified Maximum Message Size: %d\n", maxMessageSize);
+    // TODO: FMTLOG
+//    sif::printError("MessageQueue::MessageQueue: Creation failed\n");
+//    sif::printError("Specified Message Depth: %d\n", messageDepth);
+//    sif::printError("Specified Maximum Message Size: %d\n", maxMessageSize);
 #endif
   }
   QueueMapManager::instance()->addMessageQueue(handle, &id);
diff --git a/src/fsfw/osal/freertos/Mutex.cpp b/src/fsfw/osal/freertos/Mutex.cpp
index 1995e1ea..6e8aa56e 100644
--- a/src/fsfw/osal/freertos/Mutex.cpp
+++ b/src/fsfw/osal/freertos/Mutex.cpp
@@ -1,6 +1,6 @@
 #include "fsfw/osal/freertos/Mutex.h"
 
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 Mutex::Mutex() {
   handle = xSemaphoreCreateMutex();
diff --git a/src/fsfw/osal/freertos/PeriodicTask.cpp b/src/fsfw/osal/freertos/PeriodicTask.cpp
index d2c46ea8..8fde9fc5 100644
--- a/src/fsfw/osal/freertos/PeriodicTask.cpp
+++ b/src/fsfw/osal/freertos/PeriodicTask.cpp
@@ -1,7 +1,7 @@
 #include "fsfw/osal/freertos/PeriodicTask.h"
 
 #include "fsfw/objectmanager/ObjectManager.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 
 PeriodicTask::PeriodicTask(const char* name, TaskPriority setPriority, TaskStackSize setStack,
diff --git a/src/fsfw/osal/freertos/QueueMapManager.cpp b/src/fsfw/osal/freertos/QueueMapManager.cpp
index cb3afb1c..cb601a27 100644
--- a/src/fsfw/osal/freertos/QueueMapManager.cpp
+++ b/src/fsfw/osal/freertos/QueueMapManager.cpp
@@ -30,9 +30,10 @@ ReturnValue_t QueueMapManager::addMessageQueue(QueueHandle_t queue, MessageQueue
                   "inside the map!"
                << std::endl;
 #else
-    sif::printError(
-        "QueueMapManager::addMessageQueue This ID is already "
-        "inside the map!\n");
+    // TODO: FMTLOG
+//    sif::printError(
+//        "QueueMapManager::addMessageQueue This ID is already "
+//        "inside the map!\n");
 #endif
     return HasReturnvaluesIF::RETURN_FAILED;
   }
@@ -51,8 +52,9 @@ QueueHandle_t QueueMapManager::getMessageQueue(MessageQueueId_t messageQueueId)
     sif::warning << "QueueMapManager::getQueueHandle: The ID " << messageQueueId
                  << " does not exists in the map!" << std::endl;
 #else
-    sif::printWarning("QueueMapManager::getQueueHandle: The ID %d does not exist in the map!\n",
-                      messageQueueId);
+    // TODO: FMTLOG
+//    sif::printWarning("QueueMapManager::getQueueHandle: The ID %d does not exist in the map!\n",
+//                      messageQueueId);
 #endif
   }
   return nullptr;
diff --git a/src/fsfw/osal/freertos/SemaphoreFactory.cpp b/src/fsfw/osal/freertos/SemaphoreFactory.cpp
index 4224386e..e74fc4b6 100644
--- a/src/fsfw/osal/freertos/SemaphoreFactory.cpp
+++ b/src/fsfw/osal/freertos/SemaphoreFactory.cpp
@@ -4,7 +4,7 @@
 #include "fsfw/osal/freertos/BinarySemaphore.h"
 #include "fsfw/osal/freertos/CountingSemaphUsingTask.h"
 #include "fsfw/osal/freertos/CountingSemaphore.h"
-#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/serviceinterface.h"
 
 SemaphoreFactory* SemaphoreFactory::factoryInstance = nullptr;