diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbf38410..b365b841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,8 @@ if(TGT_BSP MATCHES "arm/q7s")
 endif()
 
 option(ADD_ETL_LIB "Add ETL library" ON)
-if(NOT OS_FSFW)
-	set(OS_FSFW host CACHE STRING "OS for the FSFW.")
+if(NOT FSFW_OSAL)
+	set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
 endif()
 
 if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
@@ -156,7 +156,7 @@ endif()
 # Post-Sources preparation
 ################################################################################
 
-set_property(CACHE OS_FSFW PROPERTY STRINGS host linux)
+set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux)
 
 if(NOT Q7S_SIMPLE_MODE)
     # Add libraries for all sources.
@@ -243,7 +243,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/HardwareOsPreConfig.cmake b/cmake/HardwareOsPreConfig.cmake
index 38248fce..535f9b9e 100644
--- a/cmake/HardwareOsPreConfig.cmake
+++ b/cmake/HardwareOsPreConfig.cmake
@@ -1,13 +1,13 @@
 function(pre_source_hw_os_config)
 
 # FreeRTOS
-if(${OS_FSFW} MATCHES freertos)
+if(FSFW_OSAL MATCHES freertos)
 	message(FATAL_ERROR "No FreeRTOS support implemented yet.")
 # RTEMS
-elseif(${OS_FSFW} STREQUAL rtems)
+elseif(FSFW_OSAL STREQUAL rtems)
 	add_definitions(-DRTEMS)
 	message(FATAL_ERROR "No RTEMS support implemented yet.")
-elseif(${OS_FSFW} STREQUAL linux)
+elseif(FSFW_OSAL STREQUAL linux)
 	add_definitions(-DUNIX -DLINUX)	
 	find_package(Threads REQUIRED)
 # Hosted
diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake
index 8a013d83..c2670e33 100644
--- a/cmake/PreProjectConfig.cmake
+++ b/cmake/PreProjectConfig.cmake
@@ -2,21 +2,21 @@ function(pre_project_config)
 
 # Basic input sanitization
 if(DEFINED TGT_BSP)
-	if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT ${OS_FSFW} MATCHES linux)
+	if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT FSFW_OSAL MATCHES linux)
 		message(STATUS "FSFW OSAL invalid for specified target BSP ${TGT_BSP}!")
-		message(STATUS "Setting valid OS_FSFW: linux") 
-		set(OS_FSFW "linux")
+		message(STATUS "Setting valid FSFW_OSAL: linux") 
+		set(FSFW_OSAL "linux")
 	endif()
 endif()
 
 # Disable compiler checks for cross-compiling.
-if(${OS_FSFW} STREQUAL linux AND TGT_BSP)
-	if(${TGT_BSP} MATCHES "arm/q7s")
+if(FSFW_OSAL MATCHES linux AND TGT_BSP)
+	if(TGT_BSP MATCHES "arm/q7s")
 		set(CMAKE_TOOLCHAIN_FILE 
 			"${CMAKE_SCRIPT_PATH}/Q7SCrossCompileConfig.cmake"
 			PARENT_SCOPE
 		)
-	elseif (${TGT_BSP} MATCHES "arm/raspberrypi")
+	elseif(TGT_BSP MATCHES "arm/raspberrypi")
 		if(NOT DEFINED ENV{RASPBIAN_ROOTFS})
 			if(NOT DEFINED RASPBIAN_ROOTFS)
 			    message(WARNING "No RASPBIAN_ROOTFS environmental or CMake variable set!")
diff --git a/fsfw b/fsfw
index eef2fd3b..62e0465b 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit eef2fd3b7ac764f06ed5d9a3c97c894d92a515fa
+Subproject commit 62e0465b3d3aad22d03be45ca4fe30f25bc38010
diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index fae8b7d8..a6708f98 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -7,7 +7,7 @@
 
 #include <fsfw/events/EventManager.h>
 #include <fsfw/health/HealthTable.h>
-#include <fsfw/internalError/InternalErrorReporter.h>
+#include <fsfw/internalerror/InternalErrorReporter.h>
 #include <fsfw/pus/CService200ModeCommanding.h>
 #include <fsfw/pus/Service17Test.h>
 #include <fsfw/pus/Service1TelecommandVerification.h>