diff --git a/BGL/doc/BGL/Doxyfile.in b/BGL/doc/BGL/Doxyfile.in
index f3fd42fd14c..549cdf37c1b 100644
--- a/BGL/doc/BGL/Doxyfile.in
+++ b/BGL/doc/BGL/Doxyfile.in
@@ -20,7 +20,7 @@ INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/IO/polygon_mesh_io.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/METIS/partition_dual_graph.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/alpha_expansion_graphcut.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/graph_traits_inheritance_macros.h \
-         ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/shortest_path.h
+         ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/dijkstra_shortest_path.h
 
 
 EXAMPLE_PATH               +=  ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \
diff --git a/BGL/examples/BGL_surface_mesh/shortest_path.cpp b/BGL/examples/BGL_surface_mesh/shortest_path.cpp
index ab568ee5eff..988e7c618f6 100644
--- a/BGL/examples/BGL_surface_mesh/shortest_path.cpp
+++ b/BGL/examples/BGL_surface_mesh/shortest_path.cpp
@@ -2,7 +2,7 @@
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 
-#include <CGAL/boost/graph/shortest_path.h>
+#include <CGAL/boost/graph/dijkstra_shortest_path.h>
 #include <CGAL/IO/polygon_mesh_io.h>
 
 
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
   }
 
   std::vector<halfedge_descriptor> halfedge_sequence;
-  CGAL::shortest_path_between_two_vertices(vs, vt, sm,
+  CGAL::dijkstra_shortest_path(vs, vt, sm,
     std::back_inserter(halfedge_sequence));
 
   // dump
diff --git a/BGL/include/CGAL/boost/graph/shortest_path.h b/BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
similarity index 99%
rename from BGL/include/CGAL/boost/graph/shortest_path.h
rename to BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
index ccdf9cec48d..f1d3a750e1d 100644
--- a/BGL/include/CGAL/boost/graph/shortest_path.h
+++ b/BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
@@ -107,7 +107,7 @@ namespace internal {
 template<typename Graph,
          typename OutputIterator,
          typename NamedParameters = parameters::Default_named_parameters>
-OutputIterator shortest_path_between_two_vertices(
+OutputIterator dijkstra_shortest_path(
   const typename boost::graph_traits<Graph>::vertex_descriptor vs,//source
   const typename boost::graph_traits<Graph>::vertex_descriptor vt,//target
   const Graph& g,
diff --git a/Lab/demo/Lab/Scene_polyhedron_selection_item.cpp b/Lab/demo/Lab/Scene_polyhedron_selection_item.cpp
index 6bac6f095c6..686e62ec9ff 100644
--- a/Lab/demo/Lab/Scene_polyhedron_selection_item.cpp
+++ b/Lab/demo/Lab/Scene_polyhedron_selection_item.cpp
@@ -5,7 +5,6 @@
 #include <CGAL/Polygon_mesh_processing/compute_normal.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Polygon_mesh_processing/shape_predicates.h>
-#include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/property_map.h>
 #include <CGAL/Handle_hash_function.h>
@@ -31,7 +30,7 @@
 #include "triangulate_primitive.h"
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/Polygon_mesh_processing/measure.h>
-#include <CGAL/boost/graph/shortest_path.h>
+#include <CGAL/boost/graph/dijkstra_shortest_path.h>
 #include <CGAL/boost/graph/properties.h>
 
 using namespace CGAL::Three;
@@ -1496,7 +1495,7 @@ void Scene_polyhedron_selection_item_priv::computeAndDisplayPath()
   {
     fg_vertex_descriptor t(*it), s(*(it+1));
 
-    CGAL::shortest_path_between_two_vertices(s, t, mesh,
+    CGAL::dijkstra_shortest_path(s, t, mesh,
       std::back_inserter(path_halfedges));
   }