diff --git a/share/cmake/CMakeLists.txt b/share/cmake/CMakeLists.txt
index c845b7b..cfd8834 100644
--- a/share/cmake/CMakeLists.txt
+++ b/share/cmake/CMakeLists.txt
@@ -1,9 +1,9 @@
-configure_file(${PROJECT_NAME}-config.cmake.in ${PROJECT_NAME}-config.cmake @ONLY)
-configure_file(${PROJECT_NAME}-config-version.cmake.in ${PROJECT_NAME}-config-version.cmake @ONLY)
+configure_file(${PROJECT_NAME}Config.cmake.in ${PROJECT_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_NAME}ConfigVersion.cmake.in ${PROJECT_NAME}ConfigVersion.cmake @ONLY)
 install(
   FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
 )
 
diff --git a/share/cmake/triqs_Nevanlinna-config.cmake.in b/share/cmake/triqs_NevanlinnaConfig.cmake.in
similarity index 92%
rename from share/cmake/triqs_Nevanlinna-config.cmake.in
rename to share/cmake/triqs_NevanlinnaConfig.cmake.in
index 0445e4f..b889c57 100644
--- a/share/cmake/triqs_Nevanlinna-config.cmake.in
+++ b/share/cmake/triqs_NevanlinnaConfig.cmake.in
@@ -38,7 +38,7 @@ find_package(OpenMP REQUIRED COMPONENTS CXX)
 # Include the exported targets of this project
 include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake)
 
-message(STATUS "Found @PROJECT_NAME@-config.cmake with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")
+message(STATUS "Found @PROJECT_NAME@Config.cmake with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")
 
 # Was the Project built with Documentation?
 set(@PROJECT_NAME@_WITH_DOCUMENTATION @Build_Documentation@ CACHE BOOL "Was @PROJECT_NAME@ build with documentation?")
diff --git a/share/cmake/triqs_Nevanlinna-config-version.cmake.in b/share/cmake/triqs_NevanlinnaConfigVersion.cmake.in
similarity index 100%
rename from share/cmake/triqs_Nevanlinna-config-version.cmake.in
rename to share/cmake/triqs_NevanlinnaConfigVersion.cmake.in