diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core.h
similarity index 99%
rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk.h
rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core.h
index d0fbcbc6d1c..a4060a93ee0 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core.h
@@ -220,7 +220,7 @@ private:
 
 CGAL_END_NAMESPACE
 
-#include <CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_impl.h>
+#include <CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core_impl.h>
 
 #endif // CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROM_TURK_CORE_H //
 // EOF //
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_impl.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core_impl.h
similarity index 100%
rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_impl.h
rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core_impl.h
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk.h
index 694dc1239e5..aebef5e4c84 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk.h
@@ -19,7 +19,7 @@
 #define CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_H 1
 
 #include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_collapse_data.h>
-#include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_construct_collapse_data.h>
+#include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_set_collapse_data.h>
 #include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_cost.h>
 #include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_vertex_placement.h>
 
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_construct_collapse_data.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_set_collapse_data.h
similarity index 89%
rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_construct_collapse_data.h
rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_set_collapse_data.h
index 86430b6fe1b..66d0a3b31ed 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_construct_collapse_data.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/LindstromTurk_set_collapse_data.h
@@ -15,12 +15,12 @@
 //
 // Author(s)     : Fernando Cacciola <fernando_cacciola@ciudad.com.ar>
 //
-#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_CONSTRUCT_COLLAPSE_DATA_H
-#define CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_CONSTRUCT_COLLAPSE_DATA_H 1
+#ifndef CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_SET_COLLAPSE_DATA_H
+#define CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_SET_COLLAPSE_DATA_H 1
 
 #include <CGAL/Surface_mesh_simplification/TSMS_common.h>
 #include <CGAL/Surface_mesh_simplification/Policies/LindstromTurk_collapse_data.h>
-#include <CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk.h>
+#include <CGAL/Surface_mesh_simplification/Policies/Detail/Lindstrom_Turk_core.h>
 
 
 CGAL_BEGIN_NAMESPACE
@@ -67,6 +67,6 @@ public :
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_CONSTRUCT_COLLAPSE_DATA_H //
+#endif // CGAL_SURFACE_MESH_SIMPLIFICATION_LINDSTROMTURK_SET_COLLAPSE_DATA_H //
 // EOF //
  
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Construct_minimal_collapse_data.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Set_minimal_collapse_data.h
similarity index 100%
rename from Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Construct_minimal_collapse_data.h
rename to Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/Policies/Set_minimal_collapse_data.h