diff --git a/bsp_linux_board/ObjectFactory.cpp b/bsp_linux_board/ObjectFactory.cpp
index 0d3e8ce5..b24b633f 100644
--- a/bsp_linux_board/ObjectFactory.cpp
+++ b/bsp_linux_board/ObjectFactory.cpp
@@ -1,5 +1,5 @@
-#include <fsfw/hal/linux/uart/UartComIF.h>
-#include <fsfw/hal/linux/uart/UartCookie.h>
+#include <fsfw_hal/linux/uart/UartComIF.h>
+#include <fsfw_hal/linux/uart/UartCookie.h>
 #include <mission/devices/GPSHyperionHandler.h>
 #include "ObjectFactory.h"
 
@@ -31,12 +31,12 @@
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #include "fsfw/osal/common/UdpTcPollingTask.h"
 
-#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h"
-#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h"
-#include "fsfw/hal/linux/rpi/GpioRPi.h"
-#include "fsfw/hal/common/gpio/GpioCookie.h"
-#include "fsfw/hal/linux/spi/SpiCookie.h"
-#include "fsfw/hal/linux/spi/SpiComIF.h"
+#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h"
+#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
+#include "fsfw_hal/linux/rpi/GpioRPi.h"
+#include "fsfw_hal/common/gpio/GpioCookie.h"
+#include "fsfw_hal/linux/spi/SpiCookie.h"
+#include "fsfw_hal/linux/spi/SpiComIF.h"
 
 void Factory::setStaticFrameworkObjectIds() {
     PusServiceBase::packetSource = objects::PUS_PACKET_DISTRIBUTOR;
diff --git a/bsp_q7s/core/ObjectFactory.cpp b/bsp_q7s/core/ObjectFactory.cpp
index 7ba018a4..a5e045cb 100644
--- a/bsp_q7s/core/ObjectFactory.cpp
+++ b/bsp_q7s/core/ObjectFactory.cpp
@@ -48,15 +48,15 @@
 #include "mission/utility/TmFunnel.h"
 #include "linux/obc/CCSDSIPCoreBridge.h"
 
-#include "fsfw/hal/linux/uart/UartComIF.h"
-#include "fsfw/hal/linux/uart/UartCookie.h"
-#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h"
-#include "fsfw/hal/linux/i2c/I2cCookie.h"
-#include "fsfw/hal/linux/i2c/I2cComIF.h"
-#include "fsfw/hal/linux/spi/SpiCookie.h"
-#include "fsfw/hal/linux/spi/SpiComIF.h"
-#include "fsfw/hal/linux/gpio/LinuxLibgpioIF.h"
-#include "fsfw/hal/common/gpio/GpioCookie.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
+#include "fsfw_hal/linux/uart/UartCookie.h"
+#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h"
+#include "fsfw_hal/linux/i2c/I2cCookie.h"
+#include "fsfw_hal/linux/i2c/I2cComIF.h"
+#include "fsfw_hal/linux/spi/SpiCookie.h"
+#include "fsfw_hal/linux/spi/SpiComIF.h"
+#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
+#include "fsfw_hal/common/gpio/GpioCookie.h"
 
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
diff --git a/bsp_q7s/gpio/gpioCallbacks.cpp b/bsp_q7s/gpio/gpioCallbacks.cpp
index 29e7f86d..5499517b 100644
--- a/bsp_q7s/gpio/gpioCallbacks.cpp
+++ b/bsp_q7s/gpio/gpioCallbacks.cpp
@@ -1,8 +1,8 @@
 #include "gpioCallbacks.h"
 #include <devices/gpioIds.h>
 
-#include <fsfw/hal/linux/gpio/LinuxLibgpioIF.h>
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 
 
diff --git a/bsp_q7s/gpio/gpioCallbacks.h b/bsp_q7s/gpio/gpioCallbacks.h
index 55e67895..eaf9a701 100644
--- a/bsp_q7s/gpio/gpioCallbacks.h
+++ b/bsp_q7s/gpio/gpioCallbacks.h
@@ -1,8 +1,8 @@
 #ifndef LINUX_GPIO_GPIOCALLBACKS_H_
 #define LINUX_GPIO_GPIOCALLBACKS_H_
 
-#include <fsfw/hal/common/gpio/gpioDefinitions.h>
-#include <fsfw/hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/gpioDefinitions.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 
 
 namespace gpioCallbacks {
diff --git a/bsp_q7s/spi/Q7sSpiComIF.h b/bsp_q7s/spi/Q7sSpiComIF.h
index 4326bf8c..a10d63dd 100644
--- a/bsp_q7s/spi/Q7sSpiComIF.h
+++ b/bsp_q7s/spi/Q7sSpiComIF.h
@@ -1,7 +1,7 @@
 #ifndef BSP_Q7S_SPI_Q7SSPICOMIF_H_
 #define BSP_Q7S_SPI_Q7SSPICOMIF_H_
 
-#include <fsfw/hal/linux/spi/SpiComIF.h>
+#include <fsfw_hal/linux/spi/SpiComIF.h>
 
 
 /**
diff --git a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
index 0f60288f..f05fbbdf 100644
--- a/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
+++ b/bsp_q7s/spiCallbacks/rwSpiCallback.cpp
@@ -1,8 +1,8 @@
 #include <bsp_q7s/spiCallbacks/rwSpiCallback.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <mission/devices/RwHandler.h>
-#include <fsfw/hal/linux/spi/SpiCookie.h>
-#include <fsfw/hal/linux/UnixFileGuard.h>
+#include <fsfw_hal/linux/spi/SpiCookie.h>
+#include <fsfw_hal/linux/UnixFileGuard.h>
 #include "devices/gpioIds.h"
 
 namespace rwSpiCallback {
diff --git a/bsp_q7s/spiCallbacks/rwSpiCallback.h b/bsp_q7s/spiCallbacks/rwSpiCallback.h
index fd7f1592..e5a79e64 100644
--- a/bsp_q7s/spiCallbacks/rwSpiCallback.h
+++ b/bsp_q7s/spiCallbacks/rwSpiCallback.h
@@ -2,8 +2,8 @@
 #define BSP_Q7S_RW_SPI_CALLBACK_H_
 
 #include <fsfw/returnvalues/HasReturnvaluesIF.h>
-#include <fsfw/hal/linux/spi/SpiComIF.h>
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/linux/spi/SpiComIF.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 
 
 namespace rwSpiCallback {
diff --git a/common/config/spiConf.h b/common/config/spiConf.h
index 05866555..47600eb3 100644
--- a/common/config/spiConf.h
+++ b/common/config/spiConf.h
@@ -2,7 +2,7 @@
 #define COMMON_CONFIG_SPICONF_H_
 
 #include <cstdint>
-#include <fsfw/hal/linux/spi/spiDefinitions.h>
+#include <fsfw_hal/linux/spi/spiDefinitions.h>
 
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
diff --git a/fsfw b/fsfw
index 296c587e..bb88490c 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 296c587e3de10c579847e04af3176b3acaa2d701
+Subproject commit bb88490cc6cda5474d1d4913452eeb758da8cc25
diff --git a/linux/boardtest/LibgpiodTest.h b/linux/boardtest/LibgpiodTest.h
index 38325622..a18c618e 100644
--- a/linux/boardtest/LibgpiodTest.h
+++ b/linux/boardtest/LibgpiodTest.h
@@ -2,8 +2,8 @@
 #define TEST_TESTTASKS_LIBGPIODTEST_H_
 
 #include "TestTask.h"
-#include <fsfw/hal/common/gpio/GpioIF.h>
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 #include <fsfw/objectmanager/SystemObject.h>
 
 /**
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index 6f634168..84750f66 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -8,10 +8,10 @@
 #include <fsfw/tasks/TaskFactory.h>
 #include <fsfw/timemanager/Stopwatch.h>
 
-#include <fsfw/hal/linux/utility.h>
-#include <fsfw/hal/linux/UnixFileGuard.h>
-#include <fsfw/hal/common/gpio/gpioDefinitions.h>
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/linux/utility.h>
+#include <fsfw_hal/linux/UnixFileGuard.h>
+#include <fsfw_hal/common/gpio/gpioDefinitions.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 
 #include <linux/spi/spidev.h>
 #include <fcntl.h>
diff --git a/linux/boardtest/SpiTestClass.h b/linux/boardtest/SpiTestClass.h
index 7982c601..dd112a0e 100644
--- a/linux/boardtest/SpiTestClass.h
+++ b/linux/boardtest/SpiTestClass.h
@@ -1,8 +1,8 @@
 #ifndef LINUX_BOARDTEST_SPITESTCLASS_H_
 #define LINUX_BOARDTEST_SPITESTCLASS_H_
 
-#include <fsfw/hal/common/gpio/GpioIF.h>
-#include <fsfw/hal/linux/spi/SpiCookie.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <test/testtasks/TestTask.h>
 
 #include <vector>
diff --git a/linux/devices/HeaterHandler.cpp b/linux/devices/HeaterHandler.cpp
index c821aa6c..60a60328 100644
--- a/linux/devices/HeaterHandler.cpp
+++ b/linux/devices/HeaterHandler.cpp
@@ -4,7 +4,7 @@
 
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/ipc/QueueFactory.h>
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 
 HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_,
         CookieIF * gpioCookie_, object_id_t mainLineSwitcherObjectId_, uint8_t mainLineSwitch_) :
diff --git a/linux/devices/HeaterHandler.h b/linux/devices/HeaterHandler.h
index ebb267f6..b52e22d4 100644
--- a/linux/devices/HeaterHandler.h
+++ b/linux/devices/HeaterHandler.h
@@ -11,7 +11,7 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/timemanager/Countdown.h>
-#include <fsfw/hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 #include <unordered_map>
 
 /**
diff --git a/linux/devices/SolarArrayDeploymentHandler.cpp b/linux/devices/SolarArrayDeploymentHandler.cpp
index 05052c61..eea546f6 100644
--- a/linux/devices/SolarArrayDeploymentHandler.cpp
+++ b/linux/devices/SolarArrayDeploymentHandler.cpp
@@ -3,7 +3,7 @@
 #include <devices/powerSwitcherList.h>
 #include <devices/gpioIds.h>
 
-#include <fsfw/hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/objectmanager/ObjectManager.h>
 
diff --git a/linux/devices/SolarArrayDeploymentHandler.h b/linux/devices/SolarArrayDeploymentHandler.h
index 97cb48c7..5e573128 100644
--- a/linux/devices/SolarArrayDeploymentHandler.h
+++ b/linux/devices/SolarArrayDeploymentHandler.h
@@ -9,7 +9,7 @@
 #include <fsfw/devicehandlers/CookieIF.h>
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/timemanager/Countdown.h>
-#include <fsfw/hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 #include <unordered_map>
 
 /**
diff --git a/linux/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp
index bf06e031..c31160c4 100644
--- a/linux/devices/SusHandler.cpp
+++ b/linux/devices/SusHandler.cpp
@@ -2,7 +2,7 @@
 #include "OBSWConfig.h"
 
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfw/hal/linux/spi/SpiComIF.h>
+#include <fsfw_hal/linux/spi/SpiComIF.h>
 
 SusHandler::SusHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie,
         LinuxLibgpioIF* gpioComIF, gpioId_t chipSelectId) :
diff --git a/linux/devices/SusHandler.h b/linux/devices/SusHandler.h
index d40d9371..ca9a5c45 100644
--- a/linux/devices/SusHandler.h
+++ b/linux/devices/SusHandler.h
@@ -3,7 +3,7 @@
 
 #include "devicedefinitions/SusDefinitions.h"
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <fsfw/hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 
 /**
  * @brief	This is the device handler class for the SUS sensor. The sensor is
diff --git a/linux/fsfwconfig/devices/gpioIds.h b/linux/fsfwconfig/devices/gpioIds.h
index 4b222b97..aad06629 100644
--- a/linux/fsfwconfig/devices/gpioIds.h
+++ b/linux/fsfwconfig/devices/gpioIds.h
@@ -1,7 +1,7 @@
 #ifndef FSFWCONFIG_DEVICES_GPIOIDS_H_
 #define FSFWCONFIG_DEVICES_GPIOIDS_H_
 
-#include <fsfw/hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
 
 namespace gpioIds {
 	enum gpioId_t {
diff --git a/linux/obc/CCSDSIPCoreBridge.h b/linux/obc/CCSDSIPCoreBridge.h
index f5127828..2ba68a3a 100644
--- a/linux/obc/CCSDSIPCoreBridge.h
+++ b/linux/obc/CCSDSIPCoreBridge.h
@@ -3,8 +3,8 @@
 
 #include "OBSWConfig.h"
 #include <fsfw/tmtcservices/TmTcBridge.h>
-#include <fsfw/hal/common/gpio/gpioDefinitions.h>
-#include <fsfw/hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/common/gpio/gpioDefinitions.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 
 #include <cstring>
 
diff --git a/mission/devices/GyroADIS16507Handler.cpp b/mission/devices/GyroADIS16507Handler.cpp
index 7b45b8c5..ac49a89d 100644
--- a/mission/devices/GyroADIS16507Handler.cpp
+++ b/mission/devices/GyroADIS16507Handler.cpp
@@ -4,10 +4,10 @@
 #include "GyroADIS16507Handler.h"
 
 #if OBSW_ADIS16507_LINUX_COM_IF == 1
-#include "fsfw/hal/linux/utility.h"
-#include "fsfw/hal/linux/spi/SpiCookie.h"
-#include "fsfw/hal/linux/spi/SpiComIF.h"
-#include "fsfw/hal/linux/UnixFileGuard.h"
+#include "fsfw_hal/linux/utility.h"
+#include "fsfw_hal/linux/spi/SpiCookie.h"
+#include "fsfw_hal/linux/spi/SpiComIF.h"
+#include "fsfw_hal/linux/UnixFileGuard.h"
 #include <sys/ioctl.h>
 #include <unistd.h>
 #endif
diff --git a/mission/devices/PlocSupervisorHandler.h b/mission/devices/PlocSupervisorHandler.h
index edc46c85..df4645b2 100644
--- a/mission/devices/PlocSupervisorHandler.h
+++ b/mission/devices/PlocSupervisorHandler.h
@@ -4,7 +4,7 @@
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/devices/devicedefinitions/PlocSupervisorDefinitions.h>
 #include <cstring>
-#include <fsfw/hal/linux/uart/UartComIF.h>
+#include <fsfw_hal/linux/uart/UartComIF.h>
 
 /**
  * @brief	This is the device handler for the supervisor of the PLOC which is programmed by
diff --git a/mission/devices/RwHandler.h b/mission/devices/RwHandler.h
index a0577043..cd753be0 100644
--- a/mission/devices/RwHandler.h
+++ b/mission/devices/RwHandler.h
@@ -3,7 +3,7 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/devices/devicedefinitions/RwDefinitions.h>
-#include <fsfw/hal/linux/gpio/LinuxLibgpioIF.h>
+#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <string.h>
 
 /**
diff --git a/tmtc b/tmtc
index bc32472d..a226bf65 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit bc32472d88a0d7a1566f53c05a1bc49f3c377985
+Subproject commit a226bf659eeadd3ad300b249d2659043317e2245