diff --git a/CMakeLists.txt b/CMakeLists.txt
index 923d5cc5..e78e8929 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,14 +93,6 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-if(FSFW_BUILD_UNITTESTS)
-    configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
-    configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
-else()
-    configure_file(src/fsfw/FSFW.h.in FSFW.h)
-    configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
-endif()
-
 if(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
     set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -155,6 +147,14 @@ else()
     set(OS_FSFW "host")
 endif()
 
+if(FSFW_BUILD_UNITTESTS)
+    configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
+    configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
+else()
+    configure_file(src/fsfw/FSFW.h.in FSFW.h)
+    configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
+endif()
+
 message(STATUS "Compiling FSFW for the ${FSFW_OS_NAME} operating system.")
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5a8f139b..e4670807 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,5 +16,3 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
 target_include_directories(${LIB_FSFW_NAME} INTERFACE
     ${CMAKE_CURRENT_BINARY_DIR}
 )
-
-configure_file(fsfw/FSFW.h.in fsfw/FSFW.h)
diff --git a/src/fsfw/tcdistribution/PUSDistributor.cpp b/src/fsfw/tcdistribution/PUSDistributor.cpp
index adab58c8..0670890f 100644
--- a/src/fsfw/tcdistribution/PUSDistributor.cpp
+++ b/src/fsfw/tcdistribution/PUSDistributor.cpp
@@ -30,19 +30,19 @@ PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
         if(tcStatus != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_VERBOSE_LEVEL >= 1
             const char* keyword = "unnamed error";
-            if(tcStatus == TcPacketCheck::INCORRECT_CHECKSUM) {
+            if(tcStatus == TcPacketCheckPUS::INCORRECT_CHECKSUM) {
                 keyword = "checksum";
             }
-            else if(tcStatus == TcPacketCheck::INCORRECT_PRIMARY_HEADER) {
+            else if(tcStatus == TcPacketCheckPUS::INCORRECT_PRIMARY_HEADER) {
                 keyword = "incorrect primary header";
             }
-            else if(tcStatus == TcPacketCheck::ILLEGAL_APID) {
+            else if(tcStatus == TcPacketCheckPUS::ILLEGAL_APID) {
                 keyword = "illegal APID";
             }
-            else if(tcStatus == TcPacketCheck::INCORRECT_SECONDARY_HEADER) {
+            else if(tcStatus == TcPacketCheckPUS::INCORRECT_SECONDARY_HEADER) {
                 keyword = "incorrect secondary header";
             }
-            else if(tcStatus == TcPacketCheck::INCOMPLETE_PACKET) {
+            else if(tcStatus == TcPacketCheckPUS::INCOMPLETE_PACKET) {
                 keyword = "incomplete packet";
             }
 #if FSFW_CPP_OSTREAM_ENABLED == 1