diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
index c2f60f80039..f8c9dcdb219 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
@@ -33,7 +33,7 @@
  */
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/graph/graph_concepts.hpp>
 #include <CGAL/boost/iterator/counting_iterator.hpp>
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_2.h
index 060db488191..d9bed57a668 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_2.h
@@ -34,7 +34,7 @@
  */
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Arrangement_2.h>
 #include <CGAL/Arrangement_2/graph_traits_dual.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_2.h
index ac1180a7a6d..767821316db 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_2.h
@@ -34,7 +34,7 @@
  */
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Arrangement_on_surface_2.h>
 #include <CGAL/Arrangement_2/graph_traits_dual.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_with_history_2.h
index a93ff9f0ed8..0156c854a14 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_with_history_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_on_surface_with_history_2.h
@@ -35,7 +35,7 @@
  */
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Arrangement_on_surface_with_history_2.h>
 #include <CGAL/Arrangement_2/graph_traits_dual.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_with_history_2.h
index 6ab1c8c5b51..03848de9e1f 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_with_history_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_dual_arrangement_with_history_2.h
@@ -35,7 +35,7 @@
  */
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Arrangement_with_history_2.h>
 #include <CGAL/Arrangement_2/graph_traits_dual.h>
diff --git a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
index b4fbdbdb4b2..cff29691149 100644
--- a/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
+++ b/BGL/include/CGAL/boost/graph/Face_filtered_graph.h
@@ -24,7 +24,7 @@
 #include <CGAL/assertions.h>
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/boost/graph/iterator.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/Dynamic_property_map.h>
 #include <CGAL/assertions.h>
diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
index c7f22c5831f..32e99bb34ff 100644
--- a/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
+++ b/BGL/include/CGAL/boost/graph/METIS/partition_dual_graph.h
@@ -26,7 +26,7 @@
 #include <CGAL/boost/graph/copy_face_graph.h>
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/boost/graph/helpers.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <CGAL/assertions.h>
diff --git a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h
index 5218268a4ba..48875922720 100644
--- a/BGL/include/CGAL/boost/graph/METIS/partition_graph.h
+++ b/BGL/include/CGAL/boost/graph/METIS/partition_graph.h
@@ -24,7 +24,7 @@
 #include <CGAL/boost/graph/copy_face_graph.h>
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/boost/graph/helpers.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <CGAL/assertions.h>
diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/Named_function_parameters.h
similarity index 84%
rename from BGL/include/CGAL/boost/graph/named_function_params.h
rename to BGL/include/CGAL/boost/graph/Named_function_parameters.h
index 90b3e0c9575..cd1527a68b0 100644
--- a/BGL/include/CGAL/boost/graph/named_function_params.h
+++ b/BGL/include/CGAL/boost/graph/Named_function_parameters.h
@@ -27,7 +27,7 @@
 #include <boost/mpl/if.hpp>
 
 #define CGAL_BGL_NP_TEMPLATE_PARAMETERS T, typename Tag, typename Base
-#define CGAL_BGL_NP_CLASS CGAL::cgal_bgl_named_params<T,Tag,Base>
+#define CGAL_BGL_NP_CLASS CGAL::Named_function_parameters<T,Tag,Base>
 
 
 namespace CGAL {
@@ -136,19 +136,19 @@ get_parameter_impl(const Named_params_impl<T, Tag, Base>& np, Query_tag tag)
 
 
 template <typename T, typename Tag, typename Base = internal_np::No_property>
-struct cgal_bgl_named_params
+struct Named_function_parameters
   : internal_np::Named_params_impl<T, Tag, Base>
 {
   typedef internal_np::Named_params_impl<T, Tag, Base> base;
-  typedef cgal_bgl_named_params<T, Tag, Base> self;
+  typedef Named_function_parameters<T, Tag, Base> self;
 
-  cgal_bgl_named_params(T v = T()) : base(v) {}
-  cgal_bgl_named_params(T v, const Base& b) : base(v, b) {}
+  Named_function_parameters(T v = T()) : base(v) {}
+  Named_function_parameters(T v, const Base& b) : base(v, b) {}
 
-  cgal_bgl_named_params<bool, internal_np::all_default_t, self>
+  Named_function_parameters<bool, internal_np::all_default_t, self>
   all_default() const
   {
-    typedef cgal_bgl_named_params<bool, internal_np::all_default_t, self> Params;
+    typedef Named_function_parameters<bool, internal_np::all_default_t, self> Params;
     return Params(*this);
   }
 
@@ -156,10 +156,10 @@ struct cgal_bgl_named_params
 // used to concatenate several parameters
 #define CGAL_add_named_parameter(X, Y, Z)                          \
   template<typename K>                                           \
-  cgal_bgl_named_params<K, internal_np::X, self>                  \
+  Named_function_parameters<K, internal_np::X, self>                  \
   Z(const K& k) const                                            \
   {                                                              \
-    typedef cgal_bgl_named_params<K, internal_np::X, self> Params;\
+    typedef Named_function_parameters<K, internal_np::X, self> Params;\
     return Params(k, *this);                                     \
   }
 #include <CGAL/boost/graph/parameters_interface.h>
@@ -168,28 +168,28 @@ struct cgal_bgl_named_params
 
 namespace parameters {
 
-cgal_bgl_named_params<bool, internal_np::all_default_t>
+Named_function_parameters<bool, internal_np::all_default_t>
 inline all_default()
 {
-  typedef cgal_bgl_named_params<bool, internal_np::all_default_t> Params;
+  typedef Named_function_parameters<bool, internal_np::all_default_t> Params;
   return Params();
 }
 
 template <typename T, typename Tag, typename Base>
-cgal_bgl_named_params<T,Tag,Base>
-inline no_parameters(cgal_bgl_named_params<T,Tag,Base>)
+Named_function_parameters<T,Tag,Base>
+inline no_parameters(Named_function_parameters<T,Tag,Base>)
 {
-  typedef cgal_bgl_named_params<T,Tag,Base> Params;
+  typedef Named_function_parameters<T,Tag,Base> Params;
   return Params();
 }
 
 // define free functions for named parameters
 #define CGAL_add_named_parameter(X, Y, Z)        \
   template <typename K>                        \
-  cgal_bgl_named_params<K, internal_np::X>                  \
+  Named_function_parameters<K, internal_np::X>                  \
   Z(K const& p)                                \
   {                                            \
-    typedef cgal_bgl_named_params<K, internal_np::X> Params;\
+    typedef Named_function_parameters<K, internal_np::X> Params;\
     return Params(p);                          \
   }
 #include <CGAL/boost/graph/parameters_interface.h>
@@ -198,7 +198,7 @@ inline no_parameters(cgal_bgl_named_params<T,Tag,Base>)
 // function to extract a parameter
 template <typename T, typename Tag, typename Base, typename Query_tag>
 typename internal_np::Get_param<internal_np::Named_params_impl<T, Tag, Base>, Query_tag>::type
-get_parameter(const cgal_bgl_named_params<T, Tag, Base>& np, Query_tag tag)
+get_parameter(const Named_function_parameters<T, Tag, Base>& np, Query_tag tag)
 {
   return internal_np::get_parameter_impl(static_cast<const internal_np::Named_params_impl<T, Tag, Base>&>(np), tag);
 }
diff --git a/BGL/include/CGAL/boost/graph/copy_face_graph.h b/BGL/include/CGAL/boost/graph/copy_face_graph.h
index 838d0ee5a0a..f221ba45ba6 100644
--- a/BGL/include/CGAL/boost/graph/copy_face_graph.h
+++ b/BGL/include/CGAL/boost/graph/copy_face_graph.h
@@ -29,7 +29,7 @@
 #include <CGAL/boost/graph/Euler_operations.h>
 #include <CGAL/boost/graph/iterator.h>
 #include <CGAL/boost/graph/helpers.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/property_map.h>
 #include <boost/unordered_map.hpp>
@@ -328,8 +328,8 @@ template <typename SourceMesh, typename TargetMesh,
           >
 void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
                      #ifndef DOXYGEN_RUNNING
-                     const CGAL::cgal_bgl_named_params<T1,Tag1,Base1>& np1,
-                     const CGAL::cgal_bgl_named_params<T2,Tag2,Base2>& np2
+                     const CGAL::Named_function_parameters<T1,Tag1,Base1>& np1,
+                     const CGAL::Named_function_parameters<T2,Tag2,Base2>& np2
                      #else
                      const NamedParameters1& np1,
                      const NamedParameters2& np2
@@ -361,7 +361,7 @@ void copy_face_graph(const SourceMesh& sm, TargetMesh& tm)
 template <typename SourceMesh, typename TargetMesh, 
           typename T, typename Tag, typename Base >
 void copy_face_graph(const SourceMesh& sm, TargetMesh& tm, 
-                     const CGAL::cgal_bgl_named_params<T,Tag,Base>& np)
+                     const CGAL::Named_function_parameters<T,Tag,Base>& np)
 {
   copy_face_graph(sm, tm, np, parameters::all_default());
 }
diff --git a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
index 9b5ca5fc66e..265fb0b07dd 100644
--- a/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
+++ b/BGL/include/CGAL/boost/graph/dijkstra_shortest_paths.h
@@ -23,7 +23,7 @@
 #define CGAL_BOOST_GRAPH_DIJKSTRA_SHORTEST_PATHS_H
 
 // This will push/pop a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/version.hpp>
 #include <climits>
diff --git a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
index 9c624d32537..5a6ad46d9ab 100644
--- a/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
+++ b/BGL/include/CGAL/boost/graph/graph_traits_OpenMesh.h
@@ -19,7 +19,7 @@
 // Author(s)     : Andreas Fabri, Philipp Moeller
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
diff --git a/BGL/include/CGAL/boost/graph/io.h b/BGL/include/CGAL/boost/graph/io.h
index 431bf45455a..84c2551bb40 100644
--- a/BGL/include/CGAL/boost/graph/io.h
+++ b/BGL/include/CGAL/boost/graph/io.h
@@ -33,7 +33,7 @@
 #include <CGAL/boost/graph/Euler_operations.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 namespace CGAL {
 /*!
diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h
index 712e0946da8..8c08af7a69e 100644
--- a/BGL/include/CGAL/boost/graph/named_params_helper.h
+++ b/BGL/include/CGAL/boost/graph/named_params_helper.h
@@ -19,7 +19,7 @@
 #ifndef CGAL_BOOST_GRAPH_NAMED_PARAMETERS_HELPERS_H
 #define CGAL_BOOST_GRAPH_NAMED_PARAMETERS_HELPERS_H
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Origin.h>
@@ -146,7 +146,7 @@ namespace CGAL {
   };
 
   template<typename PolygonMesh,
-           typename NamedParametersGT = cgal_bgl_named_params<bool, internal_np::all_default_t>,
+           typename NamedParametersGT = Named_function_parameters<bool, internal_np::all_default_t>,
            typename NamedParametersVPM = NamedParametersGT >
   class GetGeomTraits
   {
@@ -249,7 +249,7 @@ namespace CGAL {
     namespace parameters
     {
       template <typename PointRange>
-      cgal_bgl_named_params<bool, internal_np::all_default_t>
+      Named_function_parameters<bool, internal_np::all_default_t>
       inline all_default(const PointRange&)
       {
         return CGAL::parameters::all_default();
diff --git a/BGL/test/BGL/test_cgal_bgl_named_params.cpp b/BGL/test/BGL/test_cgal_bgl_named_params.cpp
index 77a6549dca9..92226344997 100644
--- a/BGL/test/BGL/test_cgal_bgl_named_params.cpp
+++ b/BGL/test/BGL/test_cgal_bgl_named_params.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/assertions.h>
 #include <boost/type_traits/is_same.hpp>
 
diff --git a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
index b0915a0bc7f..2c6c7170285 100644
--- a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
+++ b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
diff --git a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp
index 659a84f5a01..3f77147c898 100644
--- a/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp
+++ b/Linear_cell_complex/benchmark/Linear_cell_complex_2/surface_mesh/IO_off.cpp
@@ -24,7 +24,7 @@
 
 #include "IO.h"
 #include <stdio.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 //== IMPLEMENTATION ===========================================================
diff --git a/Point_set_3/include/CGAL/Point_set_3.h b/Point_set_3/include/CGAL/Point_set_3.h
index e93d857a58b..01c0ac7ea01 100644
--- a/Point_set_3/include/CGAL/Point_set_3.h
+++ b/Point_set_3/include/CGAL/Point_set_3.h
@@ -31,7 +31,7 @@
 
 #include <CGAL/demangle.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 
@@ -855,13 +855,13 @@ public:
 #ifdef DOXYGEN_RUNNING
   unspecified_type
 #else
-  cgal_bgl_named_params
+  Named_function_parameters
   <typename Kernel_traits<Point>::Kernel,
    internal_np::geom_traits_t,
-   cgal_bgl_named_params
+   Named_function_parameters
    <typename CGAL::Point_set_3<Point, Vector>::template Property_map<Vector>,
     internal_np::normal_t,
-    cgal_bgl_named_params
+    Named_function_parameters
     <typename CGAL::Point_set_3<Point, Vector>::template Property_map<Point>,
      internal_np::point_t> > >
 #endif
@@ -1198,13 +1198,13 @@ namespace Point_set_processing_3
   namespace parameters
   {
     template <typename Point, typename Vector>
-    cgal_bgl_named_params
+    Named_function_parameters
     <typename Kernel_traits<Point>::Kernel,
      internal_np::geom_traits_t,
-     cgal_bgl_named_params
+     Named_function_parameters
      <typename CGAL::Point_set_3<Point, Vector>::template Property_map<Vector>,
       internal_np::normal_t,
-      cgal_bgl_named_params
+      Named_function_parameters
       <typename CGAL::Point_set_3<Point, Vector>::template Property_map<Point>,
        internal_np::point_t> > >
     inline all_default(const CGAL::Point_set_3<Point, Vector>& ps)
diff --git a/Point_set_processing_3/include/CGAL/IO/read_las_points.h b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
index 576c1a87cb8..3943d1e48ae 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_las_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_las_points.h
@@ -35,7 +35,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Kernel_traits.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <boost/version.hpp>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_off_points.h b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
index e0486840f98..6a077e86a7a 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_off_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_off_points.h
@@ -31,7 +31,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Kernel_traits.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iostream>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
index 30348fc9000..d80f3864fc1 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_ply_points.h
@@ -36,7 +36,7 @@
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/IO/io.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <boost/version.hpp>
diff --git a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
index 5ef24a364a5..aeb268b6f75 100644
--- a/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
@@ -30,7 +30,7 @@
 #include <CGAL/Origin.h>
 #include <CGAL/Kernel_traits.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iostream>
diff --git a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
index 68e3b761f03..48a02e08977 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_ply_points.h
@@ -35,7 +35,7 @@
 #include <CGAL/IO/read_ply_points.h>
 #include <CGAL/Iterator_range.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <boost/version.hpp>
diff --git a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
index 6c7554af64e..1841dce9929 100644
--- a/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
+++ b/Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
@@ -29,7 +29,7 @@
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Iterator_range.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iostream>
diff --git a/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h b/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
index 8437688ef94..9076077818c 100644
--- a/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/bilateral_smooth_point_set.h
@@ -33,7 +33,7 @@
 #include <CGAL/squared_distance_3.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/compute_average_spacing.h b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
index 78cced92c2d..72d3608ca07 100644
--- a/Point_set_processing_3/include/CGAL/compute_average_spacing.h
+++ b/Point_set_processing_3/include/CGAL/compute_average_spacing.h
@@ -33,7 +33,7 @@
 #include <CGAL/assertions.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h b/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
index f3d26015eac..ccabf21f918 100644
--- a/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
+++ b/Point_set_processing_3/include/CGAL/edge_aware_upsample_point_set.h
@@ -32,7 +32,7 @@
 #include <CGAL/Memory_sizer.h>
 #include <CGAL/compute_average_spacing.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/estimate_scale.h b/Point_set_processing_3/include/CGAL/estimate_scale.h
index 86a858f6928..01846f2a2cb 100644
--- a/Point_set_processing_3/include/CGAL/estimate_scale.h
+++ b/Point_set_processing_3/include/CGAL/estimate_scale.h
@@ -36,7 +36,7 @@
 #include <CGAL/random_simplify_point_set.h>
 #include <CGAL/Point_set_2.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <fstream>
diff --git a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
index 69f2bcba033..e78762c5cd5 100644
--- a/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/grid_simplify_point_set.h
@@ -33,7 +33,7 @@
 #include <CGAL/function.h>
 #include <boost/functional/hash.hpp>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h b/Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h
index 82bbbb96bb6..b5d3de3ede9 100644
--- a/Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/hierarchy_simplify_point_set.h
@@ -41,7 +41,7 @@
 #include <CGAL/Iterator_range.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 namespace CGAL {
diff --git a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
index eaa72b0c4e9..ebc66c1b24e 100644
--- a/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/jet_estimate_normals.h
@@ -34,7 +34,7 @@
 #include <CGAL/Memory_sizer.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
index 2de27622ff5..d7a520285cc 100644
--- a/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
+++ b/Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
@@ -33,7 +33,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
index 77d848ea239..1ce8b74bc4f 100644
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@@ -35,7 +35,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/use.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
index 220389d6118..ae1d11f05d8 100644
--- a/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/pca_estimate_normals.h
@@ -35,7 +35,7 @@
 #include <CGAL/Memory_sizer.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
index b8137129d57..353c2c16a62 100644
--- a/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
+++ b/Point_set_processing_3/include/CGAL/random_simplify_point_set.h
@@ -31,7 +31,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/Iterator_range.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h
index 77f2779dee5..dbd3dd54ba0 100644
--- a/Point_set_processing_3/include/CGAL/remove_outliers.h
+++ b/Point_set_processing_3/include/CGAL/remove_outliers.h
@@ -31,7 +31,7 @@
 #include <CGAL/point_set_processing_assertions.h>
 #include <CGAL/function.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <iterator>
diff --git a/Point_set_processing_3/include/CGAL/structure_point_set.h b/Point_set_processing_3/include/CGAL/structure_point_set.h
index 7534d6d503d..be295e59d5d 100644
--- a/Point_set_processing_3/include/CGAL/structure_point_set.h
+++ b/Point_set_processing_3/include/CGAL/structure_point_set.h
@@ -42,7 +42,7 @@
 #include <CGAL/Delaunay_triangulation_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_3.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <boost/iterator/counting_iterator.hpp>
diff --git a/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h b/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
index 8efb91adfbe..4d6d5f11159 100644
--- a/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
+++ b/Point_set_processing_3/include/CGAL/vcm_estimate_normals.h
@@ -38,7 +38,7 @@
 #include <CGAL/Orthogonal_k_neighbor_search.h>
 #include <CGAL/Fuzzy_sphere.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <CGAL/Default_diagonalize_traits.h>
diff --git a/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h b/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
index 7e78e9e1ed8..b00bc57961a 100644
--- a/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
+++ b/Point_set_processing_3/include/CGAL/wlop_simplify_and_regularize_point_set.h
@@ -32,7 +32,7 @@
 #include <CGAL/Memory_sizer.h>
 #include <CGAL/compute_average_spacing.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/algorithm.h>
 #include <iterator>
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
index 6fac483289b..35b6943731e 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/connected_components.h
@@ -29,7 +29,7 @@
 #include<set>
 #include<vector>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/foreach.hpp>
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h
index 695f63e9de8..16f2544fee7 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/extrude.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/copy_face_graph.h>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/boost/graph/Euler_operations.h>
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h
index 2379bbf48a4..93471268e55 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/named_function_params.h
@@ -25,7 +25,7 @@
 #include <CGAL/license/Polygon_mesh_processing/core.h>
 
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #define CGAL_PMP_NP_TEMPLATE_PARAMETERS CGAL_BGL_NP_TEMPLATE_PARAMETERS
 #define CGAL_PMP_NP_CLASS CGAL_BGL_NP_CLASS
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
index f27a4a70382..1b575939b5e 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
@@ -1609,7 +1609,7 @@ OutputIterator intersecting_meshes(const TriangleMeshRange& range,
                                          OutputIterator out,
                                          NamedParameters np)
 {
-  std::vector<cgal_bgl_named_params<bool, internal_np::all_default_t> >nps(
+  std::vector<Named_function_parameters<bool, internal_np::all_default_t> >nps(
     std::distance(range.begin(), range.end()), parameters::all_default());
   return intersecting_meshes(range, out, np, nps);
 }
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
index 8a89cafb6d7..ae5df41a9fe 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/self_intersections.h
@@ -273,7 +273,7 @@ self_intersections(const TriangleMesh& tmesh
 #ifdef DOXYGEN_RUNNING
                  , const NamedParameters& np)
 #else
-                 , const cgal_bgl_named_params<P,T,R>& np)
+                 , const Named_function_parameters<P,T,R>& np)
 #endif
 {
   return self_intersections(faces(tmesh), tmesh, out, np);
diff --git a/Polyhedron/demo/Polyhedron/include/Point_set_3.h b/Polyhedron/demo/Polyhedron/include/Point_set_3.h
index 8697f75c2cf..c616054544c 100644
--- a/Polyhedron/demo/Polyhedron/include/Point_set_3.h
+++ b/Polyhedron/demo/Polyhedron/include/Point_set_3.h
@@ -477,13 +477,13 @@ public:
   bool are_radii_uptodate() const { return m_radii_are_uptodate; }
   void set_radii_uptodate(bool /*on*/) { m_radii_are_uptodate = false; }
   
-  CGAL::cgal_bgl_named_params
+  CGAL::Named_function_parameters
   <Kernel,
    CGAL::internal_np::geom_traits_t,
-   CGAL::cgal_bgl_named_params
+   CGAL::Named_function_parameters
    <typename Base::template Property_map<Vector>,
     CGAL::internal_np::normal_t,
-    CGAL::cgal_bgl_named_params
+    CGAL::Named_function_parameters
     <typename Base::template Property_map<Point>,
      CGAL::internal_np::point_t> > >
   inline parameters() const
@@ -570,13 +570,13 @@ namespace Point_set_processing_3
   namespace parameters
   {
     template <typename Kernel>
-    cgal_bgl_named_params
+    Named_function_parameters
     <Kernel,
      internal_np::geom_traits_t,
-     cgal_bgl_named_params
+     Named_function_parameters
      <typename ::Point_set_3<Kernel>::template Property_map<typename Kernel::Vector_3>,
       internal_np::normal_t,
-      cgal_bgl_named_params
+      Named_function_parameters
       <typename ::Point_set_3<Kernel>::template Property_map<typename Kernel::Point_3>,
        internal_np::point_t> > >
     inline all_default(const ::Point_set_3<Kernel>& ps)
diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h
index 9d58faadf32..a0aad3117c6 100644
--- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h
+++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_iostream.h
@@ -29,7 +29,7 @@
 #include <CGAL/IO/print_OFF.h>
 #include <CGAL/IO/scan_OFF.h>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <iostream>
 
 namespace CGAL {
diff --git a/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h b/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h
index eae9c811ca0..3eb28ea1a5a 100644
--- a/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h
+++ b/Polyhedron_IO/include/CGAL/IO/generic_print_polyhedron.h
@@ -24,7 +24,7 @@
 
 #include <CGAL/license/Polyhedron.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/property_map.h>
 #include <boost/graph/graph_traits.hpp>
diff --git a/Scripts/developer_scripts/update_to_CGAL_np.sh b/Scripts/developer_scripts/update_to_CGAL_np.sh
index 16ee673181a..5e437b461e3 100644
--- a/Scripts/developer_scripts/update_to_CGAL_np.sh
+++ b/Scripts/developer_scripts/update_to_CGAL_np.sh
@@ -5,6 +5,8 @@ ack -l --cpp boost::param_not_found | xargs sed -i 's/boost::param_not_found/int
 ack -l --cpp boost::is_default_param | xargs sed -i 's/boost::is_default_param/parameters::is_default_parameter/g'
 ack -l --cpp boost::get_param | xargs sed -i 's/boost::get_param/parameters::get_parameter/g'
 ack -l --cpp boost::choose_param | xargs sed -i 's/boost::choose_param/parameters::choose_parameter/g'
+ack -l --cpp cgal_bgl_named_params | xargs sed -i 's/cgal_bgl_named_params/Named_function_parameters/g'
+
 
 ack -l --cpp choose_param | xargs sed -i -E 's/choose_param[ ]*\(/choose_parameter(/g'
 ack -l --cpp get_param | xargs sed -i -E 's/get_param[ ]*\(/get_parameter(/g'
diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
index 26b55c5f67a..cbd5379639c 100644
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_hosts_3.h
@@ -31,7 +31,7 @@
 
 #include <CGAL/circulator.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <CGAL/Subdivision_method_3/internal/subdivision_hosts_impl_3.h>
diff --git a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
index 51119a06f73..bd26f92897d 100644
--- a/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
+++ b/Subdivision_method_3/include/CGAL/Subdivision_method_3/subdivision_methods_3.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/circulator.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
 
 #include <CGAL/Subdivision_method_3/subdivision_hosts_3.h>
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
index 9eb49843597..def780ac178 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
@@ -56,7 +56,7 @@
 #include <CGAL/IO/File_scanner_OFF.h>
 #include <CGAL/Handle_hash_function.h>
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 namespace CGAL {
 
diff --git a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
index f42cd99887e..34d6fdeaeca 100644
--- a/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/boost/graph/graph_traits_Surface_mesh.h
@@ -26,7 +26,7 @@
 #include <CGAL/license/Surface_mesh.h>
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
index 17b8a2c53c8..bda22c32d48 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h
@@ -47,7 +47,7 @@
 #endif
 #include <CGAL/trace.h>
 
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/version.hpp>
 #ifdef CGAL_DO_NOT_USE_BOYKOV_KOLMOGOROV_MAXFLOW_SOFTWARE
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 38563ddbada..a84aa262923 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
@@ -24,7 +24,7 @@
 
 
 #include <CGAL/boost/graph/properties.h>
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <CGAL/Surface_mesh_simplification/Detail/Edge_collapse.h>
 #include <CGAL/Surface_mesh_simplification/Detail/Common.h>
@@ -102,7 +102,7 @@ struct Dummy_visitor
 template<class TM, class ShouldStop, class P, class T, class R>
 int edge_collapse ( TM& aSurface
                   , ShouldStop const& aShould_stop
-                  , cgal_bgl_named_params<P,T,R> const& aParams 
+                  , Named_function_parameters<P,T,R> const& aParams 
                   ) 
 {
   using parameters::choose_parameter;
@@ -127,7 +127,7 @@ int edge_collapse ( TM& aSurface
   template<class TM, class ShouldStop, class GT, class P, class T, class R>
 int edge_collapse ( TM& aSurface
                   , ShouldStop const& aShould_stop
-                  , cgal_bgl_named_params<P,T,R> const& aParams 
+                  , Named_function_parameters<P,T,R> const& aParams 
                   ) 
 {
   using parameters::choose_parameter;
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
index 9c9180d3135..af848b05868 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_Delaunay_triangulation_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
index f235ef1e975..71c2595be71 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
index 5d35c80e748..86830b254e4 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Constrained_triangulation_plus_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_CONSTRAINED_TRIANGULATION_PLUS_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
index 4ce347b7e6f..868b4c365db 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Delaunay_triangulation_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_DELAUNAY_TRIANGULATION_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
index 6c5fc6c41c6..e2900ca5d3d 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Regular_triangulation_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_REGULAR_TRIANGULATION_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
index 0a901850a6d..9d5685647e0 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_2.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h>
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
index 4a79b2f69ef..fee7dcc69b2 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h
@@ -24,7 +24,7 @@
 #include <functional>
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>
diff --git a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
index dd24d64a7ae..615b81d3640 100644
--- a/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/boost/graph/graph_traits_Triangulation_hierarchy_2.h
@@ -22,7 +22,7 @@
 #define CGAL_GRAPH_TRAITS_TRIANGULATION_HIERARCHY_2_H
 
 // include this to avoid a VC15 warning
-#include <CGAL/boost/graph/named_function_params.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
 
 #include <boost/config.hpp>
 #include <boost/iterator_adaptors.hpp>