diff --git a/CMLibCommon.cmake b/CMLibCommon.cmake
index da3bd50..3ec917a 100644
--- a/CMLibCommon.cmake
+++ b/CMLibCommon.cmake
@@ -19,6 +19,7 @@ set_project_version()
 include(CMLibOrganizationName)
 set_organization_name()
 
+include(CMLibGlobalVariables)
 include(CMLibInstallInOpt)
 include(CMLibLSBInfo)
 include(CMLibCompiler)
diff --git a/CMLibCompilerFeaturesHPPGenerate.cmake b/CMLibCompilerFeaturesHPPGenerate.cmake
index 3dfa8a1..d88fd1a 100644
--- a/CMLibCompilerFeaturesHPPGenerate.cmake
+++ b/CMLibCompilerFeaturesHPPGenerate.cmake
@@ -1,9 +1,8 @@
 include(WriteCompilerDetectionHeader)
-string(TOUPPER ${PROJECT_NAME} _project_name_uppercase)
 
 write_compiler_detection_header(
   FILE include/compiler_features.hpp
-  PREFIX ${_project_name_uppercase}
+  PREFIX ${CMLIB_PROJECT_NAME_CANONICAL}
   COMPILERS GNU Clang MSVC Intel
   FEATURES
   cxx_nullptr
diff --git a/CMLibConfigHPPGenerate.cmake b/CMLibConfigHPPGenerate.cmake
index dc9c7e6..34f536c 100644
--- a/CMLibConfigHPPGenerate.cmake
+++ b/CMLibConfigHPPGenerate.cmake
@@ -2,6 +2,5 @@ function(cmlib_config_hpp_generate)
   get_property(VERSION_INT GLOBAL PROPERTY VERSION_INT)
   get_property(VERSION_STR GLOBAL PROPERTY VERSION_STR)
   get_property(ORGANIZATION_NAME GLOBAL PROPERTY ORGANIZATION_NAME)
-  string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPERCASE)
   configure_file(${CMAKE_SOURCE_DIR}/cmake/cmlib/hpp/config.hpp.in ${CMAKE_BINARY_DIR}/include/config.hpp)
 endfunction()
diff --git a/CMLibGlobalVariables.cmake b/CMLibGlobalVariables.cmake
new file mode 100644
index 0000000..22dc80c
--- /dev/null
+++ b/CMLibGlobalVariables.cmake
@@ -0,0 +1,5 @@
+# CMLIB_PROJECT_NAME_CANONICAL
+string(TOUPPER ${PROJECT_NAME} _project_name_uppercase)
+string(REGEX REPLACE "[ -]" "_" _project_name_fixed ${_project_name_uppercase})
+set(CMLIB_PROJECT_NAME_CANONICAL ${_project_name_fixed})
+
diff --git a/hpp/config.hpp.in b/hpp/config.hpp.in
index 7b80b5e..2df7009 100644
--- a/hpp/config.hpp.in
+++ b/hpp/config.hpp.in
@@ -1,8 +1,8 @@
-#ifndef @PROJECT_NAME_UPPERCASE@_CONFIG_HPP_
-#define @PROJECT_NAME_UPPERCASE@_CONFIG_HPP_
+#ifndef @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_
+#define @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_
 
-#define @PROJECT_NAME_UPPERCASE@_VERSION_STR "@VERSION_STR@"
-#define @PROJECT_NAME_UPPERCASE@_VERSION_INT @VERSION_INT@
+#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_STR "@VERSION_STR@"
+#define @CMLIB_PROJECT_NAME_CANONICAL@_VERSION_INT @VERSION_INT@
 #define ORGANIZATION_NAME "@ORGANIZATION_NAME@"
 #define PROJECT_NAME "@CMAKE_PROJECT_NAME@"
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
@@ -12,4 +12,5 @@
 #cmakedefine RELEASE @RELEASE@
 #cmakedefine ANALYSIS @ANALYSIS@
 
-#endif // @PROJECT_NAME_UPPERCASE@_CONFIG_HPP_
+#endif /* @CMLIB_PROJECT_NAME_CANONICAL@_CONFIG_HPP_ */
+