diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce13f6bc..578fff0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-modules/r
 # Version file handling  #
 ##########################
 
-set(FSFW_VERSION_IF_GIT_FAILS 4)
-set(FSFW_SUBVERSION_IF_GIT_FAILS 0)
-set(FSFW_REVISION_IF_GIT_FAILS 0)
+set(FSFW_VERSION_MAJOR_IF_GIT_FAILS 4)
+set(FSFW_VERSION_MINOR_IF_GIT_FAILS 0)
+set(FSFW_VERSION_REVISION_IF_GIT_FAILS 0)
 
 set(FSFW_GIT_VER_HANDLING_OK FALSE)
 # Check whether we got any revision (which isn't
@@ -29,13 +29,13 @@ if(GIT_INFO)
     list(GET FSFW_GIT_INFO 3 FSFW_VERSION_REVISION)
     list(GET FSFW_GIT_INFO 4 FSFW_VERSION_VCS_INFO)
     if(NOT FSFW_VERSION)
-        set(FSFW_VERSION ${FSFW_VERSION_IF_GIT_FAILS})
+        set(FSFW_VERSION ${FSFW_VERSION_MAJOR_IF_GIT_FAILS})
     endif()
     if(NOT FSFW_SUBVERSION)
-        set(FSFW_SUBVERSION ${FSFW_SUBVERSION_IF_GIT_FAILS})
+        set(FSFW_SUBVERSION ${FSFW_VERSION_MINOR_IF_GIT_FAILS})
     endif()
     if(NOT FSFW_REVISION)
-        set(FSFW_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
+        set(FSFW_REVISION ${FSFW_VERSION_REVISION_IF_GIT_FAILS})
     endif()
     set(FSFW_GIT_VER_HANDLING_OK TRUE)
 else()
@@ -43,9 +43,9 @@ else()
 endif()
 
 if(NOT FSFW_GIT_VER_HANDLING_OK)
-    set(FSFW_VERSION ${FSFW_VERSION_IF_GIT_FAILS})
-    set(FSFW_SUBVERSION ${FSFW_SUBVERSION_IF_GIT_FAILS})
-    set(FSFW_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
+    set(FSFW_VERSION_MAJOR ${FSFW_VERSION_IF_GIT_FAILS})
+    set(FSFW_VERSION_MINOR ${FSFW_SUBVERSION_IF_GIT_FAILS})
+    set(FSFW_VERSION_REVISION ${FSFW_REVISION_IF_GIT_FAILS})
     set(GIT_REV "N/A")
     set(GIT_DIFF "")
     set(GIT_BRANCH "N/A")