diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f0a961..df5c215 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,10 +13,10 @@ cmake_policy(VERSION 3.9...3.14)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 include(FairLoggerLib)
 
-get_git_version(OUTVAR_PREFIX FairLogger)
+get_git_version()
 
-project(FairLogger VERSION ${FairLogger_VERSION} LANGUAGES C CXX)
-message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${FairLogger_GIT_VERSION} from ${FairLogger_DATE}")
+project(FairLogger VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
+message(STATUS "${BWhite}${PROJECT_NAME}${CR} ${PROJECT_GIT_VERSION} from ${PROJECT_DATE}")
 
 set_fairlogger_defaults()
 
@@ -56,7 +56,7 @@ target_include_directories(FairLogger
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 set_target_properties(FairLogger PROPERTIES
-  VERSION ${FairLogger_GIT_VERSION}
+  VERSION ${PROJECT_GIT_VERSION}
   SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
 )
 
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index 69b311e..c546ecb 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -37,7 +37,7 @@ function(get_git_version)
   cmake_parse_arguments(ARGS "" "DEFAULT_VERSION;DEFAULT_DATE;OUTVAR_PREFIX" "" ${ARGN})
 
   if(NOT ARGS_OUTVAR_PREFIX)
-    set(ARGS_OUTVAR_PREFIX FairLogger)
+    set(ARGS_OUTVAR_PREFIX PROJECT)
   endif()
 
   if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
@@ -151,7 +151,7 @@ endmacro()
 macro(install_fairlogger_cmake_package)
   include(CMakePackageConfigHelpers)
   set(PACKAGE_INSTALL_DESTINATION
-    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${FairLogger_GIT_VERSION}
+    ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${PROJECT_GIT_VERSION}
   )
   install(EXPORT ${FairLogger_EXPORT_SET}
     NAMESPACE ${PROJECT_NAME}::
diff --git a/logger/Version.h.in b/logger/Version.h.in
index f25e56b..07e8e20 100644
--- a/logger/Version.h.in
+++ b/logger/Version.h.in
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2018-2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -13,7 +13,7 @@
 #define FAIRLOGGER_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
 #define FAIRLOGGER_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define FAIRLOGGER_VERSION_PATCH @PROJECT_VERSION_PATCH@
-#define FAIRLOGGER_GIT_VERSION "@FairLogger_GIT_VERSION@"
-#define FAIRLOGGER_GIT_DATE "@FairLogger_GIT_DATE@"
+#define FAIRLOGGER_GIT_VERSION "@PROJECT_GIT_VERSION@"
+#define FAIRLOGGER_GIT_DATE "@PROJECT_GIT_DATE@"
 
 #endif // FAIR_LOGGER_VERSION_H