diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h
index 4c9dab18b43..a0856f2069f 100644
--- a/BGL/include/CGAL/boost/graph/named_params_helper.h
+++ b/BGL/include/CGAL/boost/graph/named_params_helper.h
@@ -308,7 +308,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits<Graph>::fa
   }
 
   template<typename PointRange,
-           typename NamedParameters = CGAL::Named_function_parameters<bool, internal_np::all_default_t>,
+           typename NamedParameters = Named_function_parameters<bool, internal_np::all_default_t>,
            bool has_nested_iterator = internal::Has_nested_type_iterator<PointRange>::value>
   class GetPointMap
   {
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
index da098ddb327..acfd22a2276 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt
@@ -193,6 +193,11 @@ as shown in the following example.
 
 \cgalExample{Polygon_mesh_processing/triangulate_faces_example.cpp}
 
+An additional parameter, named `triangulate_visitor` can be used to track the how faces
+are triangulated into subfaces. The following examples shows how to use it.
+
+\cgalExample{Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp}
+
 
 \subsubsection RemeshingExample_1 Isotropic Remeshing of a Region on a Polygon Mesh
 
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
index 66c4609d25c..9fa1de58990 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/examples.txt
@@ -29,4 +29,5 @@
 \example Polygon_mesh_processing/shape_smoothing_example.cpp
 \example Polygon_mesh_processing/locate_example.cpp
 \example Polygon_mesh_processing/orientation_pipeline_example.cpp
+\example Polygon_mesh_processing/triangulate_faces_split_visitor_example.cpp
 */
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 7b140d76f16..595e2cf560d 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
@@ -450,11 +450,11 @@ public:
 *   \cgalParamNEnd
 *
 *   \cgalParamNBegin{triangulate_visitor}
-*     \cgalParamDescription{a visitor that allows to track how faces are triangulated into subfaces}
+*     \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces}
 *     \cgalParamType{a class model of `PMPTriangulateFaceVisitor`}
-*     \cgalParamDefault{`Triangulate_faces::Default_visitor<TriangleMesh>`}
+*     \cgalParamDefault{`Triangulate_faces::Default_visitor<PolygonMesh>`}
 *     \cgalParamExtra{Note that the visitor will be copied, so
-*                     it should not have any data member that does have a reference-like type.}
+*                     it must not have any data member that does not have a reference-like type.}
 *   \cgalParamNEnd
 * \cgalNamedParamsEnd
 *
@@ -532,11 +532,11 @@ bool triangulate_face(typename boost::graph_traits<PolygonMesh>::face_descriptor
 *   \cgalParamNEnd
 *
 *   \cgalParamNBegin{triangulate_visitor}
-*     \cgalParamDescription{a visitor that allows to track how faces are triangulated into subfaces}
+*     \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces}
 *     \cgalParamType{a class model of `PMPTriangulateFaceVisitor`}
-*     \cgalParamDefault{`Triangulate_faces::Default_visitor<TriangleMesh>`}
+*     \cgalParamDefault{`Triangulate_faces::Default_visitor<PolygonMesh>`}
 *     \cgalParamExtra{Note that the visitor will be copied, so
-*                     it should not have any data member that does have a reference-like type.}
+*                     it must not have any data member that does not have a reference-like type.}
 *  `\cgalParamNEnd
 * \cgalNamedParamsEnd
 *
@@ -610,11 +610,11 @@ bool triangulate_faces(FaceRange face_range, PolygonMesh& pmesh)
 *   \cgalParamNEnd
 *
 *   \cgalParamNBegin{triangulate_visitor}
-*     \cgalParamDescription{a visitor that allows to track how faces are triangulated into subfaces}
+*     \cgalParamDescription{a visitor that enables to track how faces are triangulated into subfaces}
 *     \cgalParamType{a class model of `PMPTriangulateFaceVisitor`}
-*     \cgalParamDefault{`Triangulate_faces::Default_visitor<TriangleMesh>`}
+*     \cgalParamDefault{`Triangulate_faces::Default_visitor<PolygonMesh>`}
 *     \cgalParamExtra{Note that the visitor will be copied, so
-*                     it should not have any data member that does have a reference-like type.}
+*                     it must not have any data member that does not have a reference-like type.}
 *   \cgalParamNEnd
 * \cgalNamedParamsEnd
 *