diff --git a/.gitattributes b/.gitattributes
index 18111746711..661ecc5b54d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1663,9 +1663,14 @@ Installation/CGALConfig_install.cmake.source.in -text
 Installation/INSTALL_via_cmake -text
 Installation/LICENSE.FREE_USE -text
 Installation/cmake/modules/AddSubdirectories.cmake -text
+Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake -text
+Installation/cmake/modules/CGAL_Common.cmake -text
+Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake -text
+Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake -text
 Installation/cmake/modules/CGAL_Locate_CGAL_TAUCS.cmake -text
 Installation/cmake/modules/CGAL_Macros.cmake -text
 Installation/cmake/modules/CGAL_SetupBoost.cmake -text
+Installation/cmake/modules/CGAL_SetupDependencies.cmake -text
 Installation/cmake/modules/CGAL_SetupFlags.cmake -text
 Installation/cmake/modules/CGAL_SetupGMP.cmake -text
 Installation/cmake/modules/CGAL_SetupGMPXX.cmake -text
@@ -1675,14 +1680,11 @@ Installation/cmake/modules/CGAL_UseBLAS.cmake -text
 Installation/cmake/modules/CGAL_UseBoostProgramOptions.cmake -text
 Installation/cmake/modules/CGAL_UseLAPACK.cmake -text
 Installation/cmake/modules/CGAL_UseTAUCS.cmake -text
-Installation/cmake/modules/CGALcommon.cmake -text
-Installation/cmake/modules/CheckCXXFileRuns.cmake -text
 Installation/cmake/modules/CreateSingleSourceCGALProgram.cmake -text
 Installation/cmake/modules/CreateSingleSourceCGALQt3Program.cmake -text
 Installation/cmake/modules/CreateSingleSourceCGALQt4Program.cmake -text
 Installation/cmake/modules/FindBLAS.cmake -text
 Installation/cmake/modules/FindBoost.cmake -text
-Installation/cmake/modules/FindCGALDependencies.cmake -text
 Installation/cmake/modules/FindCGAL_CORE.cmake -text
 Installation/cmake/modules/FindCORE.cmake -text
 Installation/cmake/modules/FindF2C.cmake -text
@@ -1692,11 +1694,9 @@ Installation/cmake/modules/FindLAPACK.cmake -text
 Installation/cmake/modules/FindLEDA.cmake -text
 Installation/cmake/modules/FindMPFR.cmake -text
 Installation/cmake/modules/FindOpenGL.cmake -text
-Installation/cmake/modules/FindPackageHandleStandardArgs.cmake -text
 Installation/cmake/modules/FindQGLViewer.cmake -text
 Installation/cmake/modules/FindQt3-patched.cmake -text
 Installation/cmake/modules/FindTAUCS.cmake -text
-Installation/cmake/modules/GeneratorSpecificSettings.cmake -text
 Installation/cmake/modules/MacroFindOptionalCGALDependency.cmake -text
 Installation/cmake/modules/MacroOptionalFindPackage.cmake -text
 Installation/cmake/modules/OptionalAddSubdirectory.cmake -text
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 7331b378c80..97fdd983855 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -39,9 +39,9 @@ if ( NOT "${CGAL_REFERENCE_CACHE_DIR}" STREQUAL "" )
   endif()
 endif()
 
-include(CGALcommon)
-include(GeneratorSpecificSettings)
-include(CheckCXXFileRuns)
+include(CGAL_Common)
+include(CGAL_GeneratorSpecificSettings)
+include(CGAL_CheckCXXFileRuns)
 
 mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY)
 
@@ -178,7 +178,7 @@ cache_set(CGAL_PDB_3RD_PARTY_INCLUDE_DIRS   "" )
 cache_set(CGAL_PDB_3RD_PARTY_LIBRARIES      "" )
 cache_set(CGAL_PDB_3RD_PARTY_LIBRARIES_DIRS "" ) 
 
-include(FindCGALDependencies)
+include(CGAL_SetupDependencies)
 
 #--------------------------------------------------------------------------------------------------
 #
diff --git a/Installation/cmake/modules/CheckCXXFileRuns.cmake b/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake
similarity index 100%
rename from Installation/cmake/modules/CheckCXXFileRuns.cmake
rename to Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake
diff --git a/Installation/cmake/modules/CGALcommon.cmake b/Installation/cmake/modules/CGAL_Common.cmake
similarity index 100%
rename from Installation/cmake/modules/CGALcommon.cmake
rename to Installation/cmake/modules/CGAL_Common.cmake
diff --git a/Installation/cmake/modules/FindPackageHandleStandardArgs.cmake b/Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
similarity index 100%
rename from Installation/cmake/modules/FindPackageHandleStandardArgs.cmake
rename to Installation/cmake/modules/CGAL_FindPackageHandleStandardArgs.cmake
diff --git a/Installation/cmake/modules/GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
similarity index 100%
rename from Installation/cmake/modules/GeneratorSpecificSettings.cmake
rename to Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
diff --git a/Installation/cmake/modules/FindCGALDependencies.cmake b/Installation/cmake/modules/CGAL_SetupDependencies.cmake
similarity index 100%
rename from Installation/cmake/modules/FindCGALDependencies.cmake
rename to Installation/cmake/modules/CGAL_SetupDependencies.cmake
diff --git a/Installation/cmake/modules/FindBLAS.cmake b/Installation/cmake/modules/FindBLAS.cmake
index 5b138062508..73693eb0595 100644
--- a/Installation/cmake/modules/FindBLAS.cmake
+++ b/Installation/cmake/modules/FindBLAS.cmake
@@ -29,7 +29,7 @@
 
 include(CheckFunctionExists)
 
-include(GeneratorSpecificSettings)
+include(CGAL_GeneratorSpecificSettings)
 
 
 # This macro checks for the existence of the combination of fortran libraries
diff --git a/Installation/cmake/modules/FindCGAL_CORE.cmake b/Installation/cmake/modules/FindCGAL_CORE.cmake
index 04704cf947c..a127b018ae4 100644
--- a/Installation/cmake/modules/FindCGAL_CORE.cmake
+++ b/Installation/cmake/modules/FindCGAL_CORE.cmake
@@ -7,7 +7,7 @@
 
 # CORE needs GMP
 
-include(FindPackageHandleStandardArgs)
+include(CGAL_FindPackageHandleStandardArgs)
 
 
 if(GMP_FOUND)
diff --git a/Installation/cmake/modules/FindCORE.cmake b/Installation/cmake/modules/FindCORE.cmake
index 6effa1d5e52..05a0ef3aae4 100644
--- a/Installation/cmake/modules/FindCORE.cmake
+++ b/Installation/cmake/modules/FindCORE.cmake
@@ -6,7 +6,7 @@
 # TODO: support Windows and MacOSX
 
 # CORE needs GMP
-include(FindPackageHandleStandardArgs)
+include(CGAL_FindPackageHandleStandardArgs)
 
 if(GMP_FOUND)
   if (CORE_INCLUDE_DIR AND CORE_LIBRARIES)
diff --git a/Installation/cmake/modules/FindGMP.cmake b/Installation/cmake/modules/FindGMP.cmake
index 314a22334c1..0703bb4ecfc 100644
--- a/Installation/cmake/modules/FindGMP.cmake
+++ b/Installation/cmake/modules/FindGMP.cmake
@@ -7,8 +7,8 @@
 
 # TODO: support MacOSX
 
-include(FindPackageHandleStandardArgs)
-include(GeneratorSpecificSettings)
+include(CGAL_FindPackageHandleStandardArgs)
+include(CGAL_GeneratorSpecificSettings)
 
 # Is it already configured?
 if (GMP_INCLUDE_DIR AND GMP_LIBRARIES_DIR ) 
diff --git a/Installation/cmake/modules/FindGMPXX.cmake b/Installation/cmake/modules/FindGMPXX.cmake
index 6014b73a9ee..fc74360e738 100644
--- a/Installation/cmake/modules/FindGMPXX.cmake
+++ b/Installation/cmake/modules/FindGMPXX.cmake
@@ -23,7 +23,7 @@ if(GMP_FOUND)
                DOC "Path to the GMPXX library"
                )
                
-  include(FindPackageHandleStandardArgs)
+  include(CGAL_FindPackageHandleStandardArgs)
   
   find_package_handle_standard_args(GMPXX "DEFAULT_MSG" GMPXX_LIBRARIES GMPXX_INCLUDE_DIR )
 
diff --git a/Installation/cmake/modules/FindLAPACK.cmake b/Installation/cmake/modules/FindLAPACK.cmake
index 00265916039..1c46312194b 100644
--- a/Installation/cmake/modules/FindLAPACK.cmake
+++ b/Installation/cmake/modules/FindLAPACK.cmake
@@ -28,7 +28,7 @@
 
 include(CheckFunctionExists)
 
-include(GeneratorSpecificSettings)
+include(CGAL_GeneratorSpecificSettings)
 
 
 # This macro checks for the existence of the combination of fortran libraries
diff --git a/Installation/cmake/modules/FindMPFR.cmake b/Installation/cmake/modules/FindMPFR.cmake
index f8c1e28b5f4..da84fc57c0a 100644
--- a/Installation/cmake/modules/FindMPFR.cmake
+++ b/Installation/cmake/modules/FindMPFR.cmake
@@ -7,8 +7,8 @@
 
 # TODO: support MacOSX
 
-include(FindPackageHandleStandardArgs)
-include(GeneratorSpecificSettings)
+include(CGAL_FindPackageHandleStandardArgs)
+include(CGAL_GeneratorSpecificSettings)
 
 # Is it already configured?
 if (MPFR_INCLUDE_DIR AND MPFR_LIBRARIES_DIR ) 
diff --git a/Installation/cmake/modules/FindTAUCS.cmake b/Installation/cmake/modules/FindTAUCS.cmake
index 0ad0630c53c..d407ae50519 100644
--- a/Installation/cmake/modules/FindTAUCS.cmake
+++ b/Installation/cmake/modules/FindTAUCS.cmake
@@ -9,8 +9,6 @@
 #  TAUCS_LIBRARIES - TAUCS libraries name.
 #     May be null if the compiler supports auto-link (e.g. VC++).
 
-include(GeneratorSpecificSettings)
-
 # Is it already configured?
 if (TAUCS_INCLUDE_DIR AND TAUCS_LIBRARIES_DIR)
 
@@ -93,14 +91,5 @@ else()
     endif(TAUCS_FOUND)
   endif(NOT TAUCS_FIND_QUIETLY)
 
-  #message("DEBUG: TAUCS_INCLUDE_DIR = ${TAUCS_INCLUDE_DIR}")
-  #message("DEBUG: TAUCS_LIBRARIES = ${TAUCS_LIBRARIES}")
-  #message("DEBUG: TAUCS_LIBRARIES_DIR = ${TAUCS_LIBRARIES_DIR}")
-  #message("DEBUG: TAUCS_FOUND = ${TAUCS_FOUND}")
-
 endif(TAUCS_INCLUDE_DIR AND TAUCS_LIBRARIES_DIR)
 
-#mark_as_advanced(TAUCS_INCLUDE_DIR)
-#mark_as_advanced(TAUCS_DEFINITIONS)
-#mark_as_advanced(TAUCS_LIBRARIES)
-#mark_as_advanced(TAUCS_LIBRARIES_DIR)
diff --git a/Installation/cmake/modules/UseCGAL.cmake b/Installation/cmake/modules/UseCGAL.cmake
index d83b70b91ca..9500ae306d1 100644
--- a/Installation/cmake/modules/UseCGAL.cmake
+++ b/Installation/cmake/modules/UseCGAL.cmake
@@ -13,11 +13,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CGAL_CMAKE_MODULE_PATH})
 if(NOT USE_CGAL_FILE_INCLUDED) 
   set(USE_CGAL_FILE_INCLUDED 1)
 
-  include(CGALcommon)
+  include(CGAL_Common)
   
   if ( CGAL_IS_CURRENT_SCRIPT_TOP_LEVEL )
     include(CGAL_SetupFlags)
-    include(GeneratorSpecificSettings)
+    include(CGAL_GeneratorSpecificSettings)
   endif()
   
   set( CGAL_LIBRARIES ${CGAL_LIBRARY} )
diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
index 338bb85d04c..48e7969a1b2 100644
--- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
+++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt
@@ -19,7 +19,6 @@ if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
 
   include( CreateSingleSourceCGALProgram )
-  include( GeneratorSpecificSettings )
 
   # Link with BLAS and LAPACK (required)
   include( CGAL_UseLAPACK )
diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
index 7333f27306b..b573299d46c 100644
--- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
+++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt
@@ -35,7 +35,6 @@ if ( CGAL_FOUND )
   include( ${CGAL_USE_FILE} )
 
   include( CreateSingleSourceCGALProgram )
-  include( GeneratorSpecificSettings )
 
   # Link with BLAS, LAPACK and TAUCS (optional)
   include( CGAL_UseTAUCS )