diff --git a/CMakeLists.txt b/CMakeLists.txt
index bacc609b..a04d78a2 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,12 +8,18 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 ##
 # Set the name of the project and target:
 ##
-SET(WEAK_FORMS_PACKAGE_NAME "deal.II weak forms")
-SET(WEAK_FORMS_PACKAGE_SHORT_NAME "weak_forms")
-STRING(REPLACE "." "_" WEAK_FORMS_BASE_NAME "${WEAK_FORMS_PACKAGE_NAME}")
-STRING(REPLACE " " "_" WEAK_FORMS_BASE_NAME "${WEAK_FORMS_BASE_NAME}")
-STRING(TOLOWER "${WEAK_FORMS_BASE_NAME}" WEAK_FORMS_BASE_NAME)
-SET(WEAK_FORMS_LIB "${WEAK_FORMS_BASE_NAME}")
+SET(WEAK_FORMS_PROJECT_NAME "weak forms")
+SET(WEAK_FORMS_PARENT_PROJECT_NAME "deal.II")
+SET(WEAK_FORMS_PACKAGE_NAME "${WEAK_FORMS_PARENT_PROJECT_NAME}-${WEAK_FORMS_PROJECT_NAME}")
+
+# Match deal.II library name: libdeal_II <--> libdeal_II-weak_forms
+STRING(REPLACE " " "_" WEAK_FORMS_LIB "${WEAK_FORMS_PACKAGE_NAME}")
+STRING(REPLACE "." "_" WEAK_FORMS_LIB "${WEAK_FORMS_LIB}")
+
+# Match GitHub project name: dealii-weak_forms
+STRING(REPLACE " " "_" WEAK_FORMS_SANITIZED_PACKAGE_NAME "${WEAK_FORMS_PACKAGE_NAME}")
+STRING(REPLACE "." "" WEAK_FORMS_SANITIZED_PACKAGE_NAME "${WEAK_FORMS_SANITIZED_PACKAGE_NAME}")
+STRING(TOLOWER "${WEAK_FORMS_SANITIZED_PACKAGE_NAME}" WEAK_FORMS_SANITIZED_PACKAGE_NAME)
 
 ##
 # Declare project version
@@ -27,16 +33,16 @@ SET(WEAK_FORMS_VERSION ${WEAK_FORMS_VERSION_MAJOR}.${WEAK_FORMS_VERSION_MINOR}.$
 ##
 # Information about paths, install locations and names
 ##
-SET(WEAK_FORMS_CMAKE_EXPORT_NAME "${WEAK_FORMS_LIB}")
-SET(WEAK_FORMS_PROJECT_CONFIG_NAME "${WEAK_FORMS_PACKAGE_SHORT_NAME}")
-SET(WEAK_FORMS_PROJECT_TARGET_NAME "${WEAK_FORMS_PACKAGE_SHORT_NAME}Targets")
+SET(WEAK_FORMS_CMAKE_EXPORT_NAME "${WEAK_FORMS_SANITIZED_PACKAGE_NAME}")
+SET(WEAK_FORMS_PROJECT_CONFIG_NAME "${WEAK_FORMS_CMAKE_EXPORT_NAME}")
+SET(WEAK_FORMS_PROJECT_TARGET_NAME "${WEAK_FORMS_PROJECT_CONFIG_NAME}Targets")
 
 SET(WEAK_FORMS_EXECUTABLE_RELDIR "bin")
 SET(WEAK_FORMS_INCLUDE_RELDIR "include")
 SET(WEAK_FORMS_CONFIGURED_FILES_RELDIR "configured_files")
 SET(WEAK_FORMS_LIBRARY_RELDIR "lib")
 SET(WEAK_FORMS_PROJECT_CONFIG_RELDIR "${WEAK_FORMS_LIBRARY_RELDIR}/cmake/${WEAK_FORMS_PROJECT_CONFIG_NAME}")
-SET(WEAK_FORMS_SHARE_RELDIR "share/${WEAK_FORMS_PACKAGE_NAME}")
+SET(WEAK_FORMS_SHARE_RELDIR "share/${WEAK_FORMS_SANITIZED_PACKAGE_NAME}")
 SET(WEAK_FORMS_DOCHTML_RELDIR "doc")
 
 ##