diff --git a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
index f05fbbdf..dce79c42 100644
--- a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
+++ b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
@@ -24,7 +24,7 @@ ReturnValue_t spiCallback(SpiComIF* comIf, SpiCookie *cookie, const uint8_t *sen
 
     int fileDescriptor = 0;
     std::string device = cookie->getSpiDevice();
-    UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "rwSpiCallback::spiCallback: ");
+    UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "rwSpiCallback::spiCallback");
     if(fileHelper.getOpenResult() != HasReturnvaluesIF::RETURN_OK) {
         sif::error << "rwSpiCallback::spiCallback: Failed to open device file" << std::endl;
         return SpiComIF::OPENING_FILE_FAILED;
diff --git a/fsfw b/fsfw
index 04a1fe7f..b6aebb30 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 04a1fe7f1085ed7cbb243c06b3303f4cf0c3035b
+Subproject commit b6aebb3061a8417ffe09111eced07b8f17dddd3d
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index 290318a2..f3ba3279 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -85,7 +85,7 @@ void SpiTestClass::performRm3100Test(uint8_t mgmId) {
 
 
     UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR,
-            "SpiComIF::initializeInterface: ");
+            "SpiComIF::initializeInterface");
     if(fileHelper.getOpenResult()) {
         sif::error << "SpiTestClass::performRm3100Test: File descriptor could not be opened!"
                 << std::endl;
@@ -184,7 +184,7 @@ void SpiTestClass::performLis3MdlTest(uint8_t lis3Id) {
     int fileDescriptor = 0;
 
     UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR,
-            "SpiComIF::initializeInterface: ");
+            "SpiComIF::initializeInterface");
     if(fileHelper.getOpenResult()) {
         sif::error << "SpiTestClass::performLis3Mdl3100Test: File descriptor could not be opened!"
                 << std::endl;
@@ -235,7 +235,7 @@ void SpiTestClass::performL3gTest(uint8_t l3gId) {
     int fileDescriptor = 0;
 
     UnixFileGuard fileHelper(deviceName, &fileDescriptor, O_RDWR,
-            "SpiComIF::initializeInterface: ");
+            "SpiComIF::initializeInterface");
     if(fileHelper.getOpenResult()) {
         sif::error << "SpiTestClass::performLis3Mdl3100Test: File descriptor could not be opened!"
                 << std::endl;
diff --git a/mission/devices/GyroADIS16507Handler.cpp b/mission/devices/GyroADIS16507Handler.cpp
index 3065c249..2034d6a2 100644
--- a/mission/devices/GyroADIS16507Handler.cpp
+++ b/mission/devices/GyroADIS16507Handler.cpp
@@ -393,7 +393,7 @@ ReturnValue_t GyroADIS16507Handler::spiSendCallback(SpiComIF *comIf, SpiCookie *
         // Prepare transfer
         int fileDescriptor = 0;
         std::string device = cookie->getSpiDevice();
-        UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "SpiComIF::sendMessage: ");
+        UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
         if(fileHelper.getOpenResult() != HasReturnvaluesIF::RETURN_OK) {
             return SpiComIF::OPENING_FILE_FAILED;
         }
diff --git a/tmtc b/tmtc
index 28c2d201..a7f1ed90 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 28c2d2015c30bff91f63a7acac8db0a517c76f3a
+Subproject commit a7f1ed904c460005c6d22f17ab496694ae150046