diff --git a/CMLibGlobalVariables.cmake b/CMLibGlobalVariables.cmake
index 562e3ed..d2d11b2 100644
--- a/CMLibGlobalVariables.cmake
+++ b/CMLibGlobalVariables.cmake
@@ -4,6 +4,9 @@ canonical_string(${ORGANIZATION_NAME} CMLIB_ORGANIZATION_NAME_CANONICAL)
 string(TOLOWER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_LOWER)
 string(TOLOWER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_LOWER)
 
+string(TOUPPER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_UPPER)
+string(TOUPPER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_UPPER)
+
 # CMLIB_MODULE_DIR
 foreach(_m ${CMAKE_MODULE_PATH})
   if(EXISTS ${_m}/CMLibCommon.cmake)
diff --git a/hpp/cmlib_private_config.hpp.in b/hpp/cmlib_private_config.hpp.in
index b0a32a5..afc1bd3 100644
--- a/hpp/cmlib_private_config.hpp.in
+++ b/hpp/cmlib_private_config.hpp.in
@@ -15,13 +15,13 @@
 #if defined (CMLIB_ORGANIZATION_NAME_LOWER)
 #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_LOWER"
 #else
-#define CMLIB_ORGANIZATION_NAME_LOWER "@ORGANIZATION_NAME_LOWER@"
+#define CMLIB_ORGANIZATION_NAME_LOWER "@CMLIB_ORGANIZATION_NAME_LOWER@"
 #endif
 
 #if defined (CMLIB_ORGANIZATION_NAME_UPPER)
 #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_UPPER"
 #else
-#define CMLIB_ORGANIZATION_NAME_UPPER "@ORGANIZATION_NAME_UPPER@"
+#define CMLIB_ORGANIZATION_NAME_UPPER "@CMLIB_ORGANIZATION_NAME_UPPER@"
 #endif
 
 #if defined (CMLIB_PROJECT_NAME)
@@ -33,13 +33,13 @@
 #if defined (CMLIB_PROJECT_NAME_LOWER)
 #error "Duplicate definition of macros CMLIB_PROJECT_NAME_LOWER"
 #else
-#define CMLIB_PROJECT_NAME_LOWER "@CMAKE_PROJECT_NAME_LOWER@"
+#define CMLIB_PROJECT_NAME_LOWER "@CMLIB_PROJECT_NAME_LOWER@"
 #endif
 
 #if defined (CMLIB_PROJECT_NAME_UPPER)
 #error "Duplicate definition of macros CMLIB_PROJECT_NAME_UPPER"
 #else
-#define CMLIB_PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@"
+#define CMLIB_PROJECT_NAME_UPPER "@CMLIB_PROJECT_NAME_UPPER@"
 #endif
 
 #if defined (CMLIB_BUILD_TYPE)