diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9e2eda..4cee66c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,7 +15,7 @@ set(STM32_CMAKE_PATH  "${CMAKE_SCRIPT_PATH}/stm32-cmake")
 set(STM32_CUBE_H7_PATH STM32CubeH7)
 set(STM32_TOOLCHAIN_PATH $ENV{STM32_TOOLCHAIN_PATH})
 set(TARGET_TRIPLET "arm-none-eabi")
-set(OS_FSFW freertos CACHE STRING "OS for the FSFW")
+set(FSFW_OSAL freertos CACHE STRING "OS for the FSFW")
 set(STM32_ADD_NETWORKING_CODE ON)
 set(FSFW_HAL_ADD_STM32H7 ON)
 
@@ -163,7 +163,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     )
 
     # Removed unused sections.
-    if(NOT ${OS_FSFW} MATCHES rtems)
+    if(NOT FSFW_OSAL MATCHES rtems)
         target_link_options(${TARGET_NAME} PRIVATE
             "-Wl,--gc-sections"
         )
@@ -189,7 +189,7 @@ endif()
 
 string(CONCAT POST_BUILD_COMMENT
     "Build directory: ${CMAKE_BINARY_DIR}\n"
-    "Target OSAL: ${OS_FSFW}\n"
+    "Target OSAL: ${FSFW_OSAL}\n"
     "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
     "${TARGET_STRING}"
 )
diff --git a/cmake/scripts/cmake_build_config.py b/cmake/scripts/cmake_build_config.py
index 6787a1b..2085750 100755
--- a/cmake/scripts/cmake_build_config.py
+++ b/cmake/scripts/cmake_build_config.py
@@ -101,7 +101,7 @@ def main():
     print(f"Navigating into build directory: {build_path}")
     os.chdir(cmake_build_folder)
 
-    cmake_command = f"cmake {generator_cmake_arg} -DOS_FSFW=\"{cmake_fsfw_osal}\" " \
+    cmake_command = f"cmake {generator_cmake_arg} -DFSFW_OSAL=\"{cmake_fsfw_osal}\" " \
                     f"-DCMAKE_BUILD_TYPE=\"{cmake_build_type}\" {cmake_target_cfg_cmd} " \
                     f"{define_string} {source_location}"
     # Remove redundant spaces
diff --git a/example_common b/example_common
index e487913..abee093 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit e4879130b09c76dac75265768fc757759e9aedcd
+Subproject commit abee0930f97fdb46ebf2e255309a9e411f53fa0e
diff --git a/fsfw b/fsfw
index 8189435..d5dfffd 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 8189435b94b65e432b06dad930f6da8d38173e14
+Subproject commit d5dfffda2dfca299038f3b9b096efcd315289fb7
diff --git a/fsfw_hal b/fsfw_hal
index 9d20b88..1eda487 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit 9d20b8878e5422fadeee52b2543f8140aed04dc0
+Subproject commit 1eda4874cda2a31443c435fc671fd5cae8236660