diff --git a/BGL/include/CGAL/boost/graph/parameters_interface.h b/BGL/include/CGAL/boost/graph/parameters_interface.h
index 67e07522a82..97f5509b44c 100644
--- a/BGL/include/CGAL/boost/graph/parameters_interface.h
+++ b/BGL/include/CGAL/boost/graph/parameters_interface.h
@@ -15,7 +15,7 @@ CGAL_add_named_parameter(halfedge_index_t, halfedge_index, halfedge_index_map)
 CGAL_add_named_parameter(edge_index_t, edge_index, edge_index_map)
 CGAL_add_named_parameter(face_index_t, face_index, face_index_map)
 CGAL_add_named_parameter(vertex_index_t, vertex_index, vertex_index_map)
-CGAL_add_named_parameter(graph_visitor_t, graph_visitor, visitor)
+CGAL_add_named_parameter(visitor_t, visitor, visitor)
 
 CGAL_add_named_parameter(point_t, point_map, point_map)
 
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h
index a3c64422946..8c288aa3f1f 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/corefinement.h
@@ -367,11 +367,11 @@ corefine_and_compute_boolean_operations(
 
   // User visitor
   typedef typename internal_np::Lookup_named_param_def <
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters1,
     Corefinement::Default_visitor<TriangleMesh>//default
   > ::type User_visitor;
-  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np1, internal_np::graph_visitor)));
+  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np1, internal_np::visitor)));
 
   // surface intersection algorithm call
   typedef Corefinement::Face_graph_output_builder<TriangleMesh,
@@ -756,11 +756,11 @@ corefine(      TriangleMesh& tm1,
 
   // User visitor
   typedef typename internal_np::Lookup_named_param_def <
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters1,
     Corefinement::Default_visitor<TriangleMesh>//default
   > ::type User_visitor;
-  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np1, internal_np::graph_visitor)));
+  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np1, internal_np::visitor)));
 
 // surface intersection algorithm call
   typedef Corefinement::No_extra_output_from_corefinement<TriangleMesh> Ob;
@@ -846,11 +846,11 @@ autorefine(      TriangleMesh& tm,
 
 // User visitor
   typedef typename internal_np::Lookup_named_param_def <
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters,
     Corefinement::Default_visitor<TriangleMesh>//default
   > ::type User_visitor;
-  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np, internal_np::graph_visitor)));
+  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np, internal_np::visitor)));
 
 
 // surface intersection algorithm call
@@ -943,11 +943,11 @@ autorefine_and_remove_self_intersections(      TriangleMesh& tm,
 
 // User visitor
   typedef typename internal_np::Lookup_named_param_def <
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters,
     Corefinement::Default_visitor<TriangleMesh>//default
   > ::type User_visitor;
-  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np, internal_np::graph_visitor)));
+  User_visitor uv(choose_parameter<User_visitor>(get_parameter(np, internal_np::visitor)));
 
 // surface intersection algorithm call
   typedef Corefinement::Output_builder_for_autorefinement<TriangleMesh,
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
index f2110aa14f3..a4c38c7b040 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/triangulate_faces.h
@@ -483,12 +483,12 @@ bool triangulate_face(typename boost::graph_traits<PolygonMesh>::face_descriptor
   bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true);
 
   typedef typename internal_np::Lookup_named_param_def<
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters,
     Triangulate_faces::Default_visitor<PolygonMesh>//default
   >::type Visitor;
   Visitor visitor = choose_parameter<Visitor>(
-                             get_parameter(np, internal_np::graph_visitor),
+                             get_parameter(np, internal_np::visitor),
                              Triangulate_faces::Default_visitor<PolygonMesh>());
 
   internal::Triangulate_modifier<PolygonMesh, VPMap, Kernel, Visitor> modifier(vpmap, traits);
@@ -567,12 +567,12 @@ bool triangulate_faces(FaceRange face_range,
   bool use_cdt = choose_parameter(get_parameter(np, internal_np::use_delaunay_triangulation), true);
 
   typedef typename internal_np::Lookup_named_param_def<
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters,
     Triangulate_faces::Default_visitor<PolygonMesh>//default
   >::type Visitor;
   Visitor visitor = choose_parameter<Visitor>(
-                                  get_parameter(np, internal_np::graph_visitor),
+                                  get_parameter(np, internal_np::visitor),
                                   Triangulate_faces::Default_visitor<PolygonMesh>());
 
   internal::Triangulate_modifier<PolygonMesh, VPMap, Kernel, Visitor> modifier(vpmap, traits);
diff --git a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h
index 2bacc02174a..826cadc8581 100644
--- a/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h
+++ b/Surface_mesh_simplification/include/CGAL/Surface_mesh_simplification/edge_collapse.h
@@ -98,7 +98,7 @@ int edge_collapse(TM& tmesh,
                                  choose_parameter<No_constrained_edge_map<TM> >(get_parameter(np, internal_np::edge_is_constrained)),
                                  choose_parameter<LindstromTurk_cost<TM> >(get_parameter(np, internal_np::get_cost_policy)),
                                  choose_parameter<LindstromTurk_placement<TM> >(get_parameter(np, internal_np::get_placement_policy)),
-                                 choose_parameter<internal::Dummy_visitor>(get_parameter(np, internal_np::graph_visitor)));
+                                 choose_parameter<internal::Dummy_visitor>(get_parameter(np, internal_np::visitor)));
 }
 
 template<class TM, class ShouldStop>
diff --git a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
index e5e0860de53..b1818bbded1 100644
--- a/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
+++ b/Tetrahedral_remeshing/include/CGAL/tetrahedral_remeshing.h
@@ -244,12 +244,12 @@ void tetrahedral_isotropic_remeshing(
                                  No_facet());
 
   typedef typename internal_np::Lookup_named_param_def <
-    internal_np::graph_visitor_t,
+    internal_np::visitor_t,
     NamedParameters,
     Tetrahedral_remeshing::internal::Default_remeshing_visitor
   > ::type Visitor;
   Visitor visitor
-    = choose_parameter(get_parameter(np, internal_np::graph_visitor),
+    = choose_parameter(get_parameter(np, internal_np::visitor),
                        Tetrahedral_remeshing::internal::Default_remeshing_visitor());
 
 #ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE
@@ -439,12 +439,12 @@ void tetrahedral_isotropic_remeshing(
                                  No_facet());
 
   typedef typename internal_np::Lookup_named_param_def <
-              internal_np::graph_visitor_t,
+              internal_np::visitor_t,
               NamedParameters,
               Tetrahedral_remeshing::internal::Default_remeshing_visitor
               > ::type Visitor;
   Visitor visitor
-    = choose_parameter(get_parameter(np, internal_np::graph_visitor),
+    = choose_parameter(get_parameter(np, internal_np::visitor),
                        Tetrahedral_remeshing::internal::Default_remeshing_visitor());
 
 #ifdef CGAL_TETRAHEDRAL_REMESHING_VERBOSE