diff --git a/linux/spi/SpiComIF.cpp b/linux/spi/SpiComIF.cpp
index cc3b3cce..b94e1249 100644
--- a/linux/spi/SpiComIF.cpp
+++ b/linux/spi/SpiComIF.cpp
@@ -5,7 +5,7 @@
 #include <linux/spi/SpiCookie.h>
 
 #include <fsfw/ipc/MutexFactory.h>
-#include <fsfw/ipc/MutexHelper.h>
+#include <fsfw/ipc/MutexGuard.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
 
 #include <linux/spi/spidev.h>
@@ -174,7 +174,7 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
     gpioId_t gpioId = spiCookie->getChipSelectPin();
 
     /* GPIO access is mutex protected */
-    MutexHelper(spiMutex, timeoutType, timeoutMs);
+    MutexGuard(spiMutex, timeoutType, timeoutMs);
 
     /* Pull SPI CS low. For now, no support for active high given  */
     if(gpioId != gpio::NO_GPIO) {
@@ -255,7 +255,7 @@ ReturnValue_t SpiComIF::requestReceiveMessage(CookieIF *cookie, size_t requestLe
     }
 
     gpioId_t gpioId = spiCookie->getChipSelectPin();
-    MutexHelper(spiMutex, timeoutType, timeoutMs);
+    MutexGuard(spiMutex, timeoutType, timeoutMs);
     if(gpioId != gpio::NO_GPIO) {
         gpioComIF->pullLow(gpioId);
     }