diff --git a/cmake/modules/DUNEDoc.cmake b/cmake/modules/DuneDoc.cmake
similarity index 98%
rename from cmake/modules/DUNEDoc.cmake
rename to cmake/modules/DuneDoc.cmake
index b3faca3774041a1435b2a918d59d49c8f1bb4be3..54311d1d12a6a487b93b7fd8af52ffe7071e6f8f 100644
--- a/cmake/modules/DUNEDoc.cmake
+++ b/cmake/modules/DuneDoc.cmake
@@ -19,4 +19,4 @@ MACRO(create_doc_install filename targetdir)
 ENDMACRO(create_doc_install)
 
 # Support building documentation with doxygen.
-include(DUNEDoxygen)
+include(DuneDoxygen)
diff --git a/cmake/modules/DUNEDoxygen.cmake b/cmake/modules/DuneDoxygen.cmake
similarity index 100%
rename from cmake/modules/DUNEDoxygen.cmake
rename to cmake/modules/DuneDoxygen.cmake
diff --git a/cmake/modules/DUNEMPI.cmake b/cmake/modules/DuneMPI.cmake
similarity index 98%
rename from cmake/modules/DUNEMPI.cmake
rename to cmake/modules/DuneMPI.cmake
index aac9e090b8a3fffa29a084088dda1534cd6720c7..3bd792c08b29f2c3d205abe0bf973389a63cc8ec 100644
--- a/cmake/modules/DUNEMPI.cmake
+++ b/cmake/modules/DuneMPI.cmake
@@ -27,7 +27,7 @@ if(MPI_FOUND)
 endif(MPI_FOUND)
 
 # A macro that adds the MPI flags for the compilation
-function(add_DUNE_MPI_flags _target)
+function(add_dune_mpi_flags _target)
   if(MPI_FOUND)
     target_link_libraries(${_target} ${MPI_DUNE_LIBRARIES})
     # The definitions are a hack as we do not seem to know which MPI implementation was
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index ee9c87f31754218b266f90dc96dcabf6bdf06a27..f4588d8e88b6bd9a304f35bef9d39341f6f14a5f 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -151,7 +151,7 @@ macro(dune_project)
   add_definitions(-DHAVE_CONFIG_H)
 
   # Search for MPI and set the relevant variables.
-  include(DUNEMPI)
+  include(DuneMPI)
 
 
   # Make calling fortran routines from C/C++ possible
@@ -170,7 +170,7 @@ macro(dune_project)
   # Create custom target for building the documentation
   # and provide macros for installing the docs and force
   # building them before.
-  include(DUNEDoc)
+  include(DuneDoc)
 
   # activate testing the DUNE way
   include(DuneTests)
diff --git a/dune/common/parallel/test/CMakeLists.txt b/dune/common/parallel/test/CMakeLists.txt
index 6a26c93bb0da1519e80e4ca42f5bd535ecbb9c06..1f529ac2242d8bc328efa8178ff6de48daff2e60 100644
--- a/dune/common/parallel/test/CMakeLists.txt
+++ b/dune/common/parallel/test/CMakeLists.txt
@@ -6,18 +6,18 @@ add_dependencies(build_tests ${MPITESTPROGS})
 add_executable("indexsettest" indexsettest.cc)
 target_link_libraries("indexsettest" "dunecommon" ${CMAKE_THREAD_LIBS_INIT} ${})
 
-include(DUNEMPI)
+include(DuneMPI)
 add_executable("indicestest" indicestest.cc)
 target_link_libraries("indicestest" "dunecommon")
-add_DUNE_MPI_flags(indicestest)
+add_dune_mpi_flags(indicestest)
 
 add_executable("selectiontest" selectiontest.cc)
 target_link_libraries("selectiontest" "dunecommon")
-add_DUNE_MPI_flags(selectiontest)
+add_dune_mpi_flags(selectiontest)
 
 add_executable("syncertest" syncertest.cc)
 target_link_libraries("syncertest" "dunecommon")
-add_DUNE_MPI_flags(syncertest)
+add_dune_mpi_flags(syncertest)
 
 add_test(indexsettest			indexsettest)
 add_test(selectiontest			selectiontest)