diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d1e84726..f8e08c9d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
 include(OpmInit)
 
 file (READ ${PROJECT_SOURCE_DIR}/dune.module DUNE_MODULE)
-OpmGetDuneModuleDirective ("Version" opm-cmake_VERSION "${DUNE_MODULE}")
+OpmGetDuneModuleDirective ("Version" opm-common_VERSION "${DUNE_MODULE}")
 
-configure_file(opm-cmake-config.cmake.in opm-cmake-config.cmake @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/opm-cmake-config.cmake
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/opm-cmake)
+configure_file(opm-common-config.cmake.in opm-common-config.cmake @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/opm-common-config.cmake
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/opm-common)
diff --git a/configure b/configure
index 590058770..133295cbc 100644
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-# for the opm-cmake module, the configuration is a no-op since it does
+# for the opm-common module, the configuration is a no-op since it does
 # not provide any C/C++ source files
 exit 0
diff --git a/dune.module b/dune.module
index d4a250da3..27aef3dfb 100644
--- a/dune.module
+++ b/dune.module
@@ -1,4 +1,4 @@
-Module: opm-cmake
-Description: Open Porous Media Initiative build system
+Module: opm-common
+Description: Open Porous Media Initiative common module
 Version: 2015.10
 Maintainer: opm@opm-project.org
diff --git a/opm-cmake-config.cmake.in b/opm-common-config.cmake.in
similarity index 77%
rename from opm-cmake-config.cmake.in
rename to opm-common-config.cmake.in
index c25fcf1c7..fe063a046 100644
--- a/opm-cmake-config.cmake.in
+++ b/opm-common-config.cmake.in
@@ -1,3 +1,3 @@
-set (opm-cmake_VERSION "@opm-cmake_VERSION@")
+set (opm-common_VERSION "@opm-common_VERSION@")
 set(OPM_MACROS_ROOT @CMAKE_INSTALL_PREFIX@/@MODULES_INSTALL_PREFIX@)
 list(APPEND CMAKE_MODULE_PATH @CMAKE_INSTALL_PREFIX@/@MODULES_INSTALL_PREFIX@/cmake/Modules)