diff --git a/Heat_method_3/examples/Heat_method_3/heat_method.cpp b/Heat_method_3/examples/Heat_method_3/heat_method.cpp
index 0e4d24374e0..85f54a88836 100644
--- a/Heat_method_3/examples/Heat_method_3/heat_method.cpp
+++ b/Heat_method_3/examples/Heat_method_3/heat_method.cpp
@@ -1,11 +1,9 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/Heat_method_3/Heat_method_3.h>
+#include <CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h>
 
 #include <iostream>
 #include <fstream>
-#include <vector>
-#include <iostream>
 
 #include <boost/foreach.hpp>
 
diff --git a/Heat_method_3/examples/Heat_method_3/heat_method_polyhedron.cpp b/Heat_method_3/examples/Heat_method_3/heat_method_polyhedron.cpp
index 8305ead5be6..c78ea696e61 100644
--- a/Heat_method_3/examples/Heat_method_3/heat_method_polyhedron.cpp
+++ b/Heat_method_3/examples/Heat_method_3/heat_method_polyhedron.cpp
@@ -1,8 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/Heat_method_3/Heat_method_3.h>
+#include <CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h>
 
-#include <iostream>
 #include <fstream>
 #include <iostream>
 
diff --git a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp
index 0834b23507c..f3684cc29ed 100644
--- a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp
+++ b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh.cpp
@@ -1,8 +1,7 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/Heat_method_3/Heat_method_3.h>
+#include <CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h>
 
-#include <iostream>
 #include <fstream>
 #include <iostream>
 
@@ -33,7 +32,7 @@ int main(int argc, char* argv[])
   //add the first vertex as the source set
   vertex_descriptor source = *(vertices(sm).first);
   hm.add_source(source);
-  hm.fill_distance_map(heat_intensity);
+  hm.estimate_geodesic_distances(heat_intensity);
 
   Point_3 sp = sm.point(source);
   
@@ -48,7 +47,7 @@ int main(int argc, char* argv[])
     }
   }
   hm.add_source(far);
-  hm.fill_distance_map(heat_intensity);
+  hm.estimate_geodesic_distances(heat_intensity);
 
   BOOST_FOREACH(vertex_descriptor vd , vertices(sm)){
     std::cout << vd << "  is at distance " << get(heat_intensity, vd) << " " << std::endl;
diff --git a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh_intrinsic.cpp b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh_intrinsic.cpp
index 32da10b31c8..f6298db11c3 100644
--- a/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh_intrinsic.cpp
+++ b/Heat_method_3/examples/Heat_method_3/heat_method_surface_mesh_intrinsic.cpp
@@ -1,10 +1,9 @@
 #include <CGAL/Simple_cartesian.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/Heat_method_3/Heat_method_3.h>
+#include <CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h>
 
 #include <iostream>
 #include <fstream>
-#include <iostream>
 
 #include <boost/foreach.hpp>
 
@@ -34,7 +33,7 @@ int main(int argc, char* argv[])
   //add the first vertex as the source set
   vertex_descriptor source = *(vertices(sm).first);
   hm_idt.add_source(source);
-  hm_idt.fill_distance_map(vdm_idt);
+  hm_idt.estimate_geodesic_distances(vdm_idt);
 
   BOOST_FOREACH(vertex_descriptor vd , vertices(sm)){
     std::cout << vd << "  is at distance " << get(vdm_idt, vd) << " from " << source << std::endl;
diff --git a/Heat_method_3/include/CGAL/Heat_method_3/Heat_method_3.h b/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
similarity index 99%
rename from Heat_method_3/include/CGAL/Heat_method_3/Heat_method_3.h
rename to Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
index c74b9317100..dcc5e33256c 100644
--- a/Heat_method_3/include/CGAL/Heat_method_3/Heat_method_3.h
+++ b/Heat_method_3/include/CGAL/Heat_method_3/Surface_mesh_geodesic_distances_3.h
@@ -19,8 +19,8 @@
 //
 // Author(s) : Christina Vaz, Keenan Crane, Andreas Fabri
 
-#ifndef CGAL_HEAT_METHOD_3_HEAT_METHOD_3_H
-#define CGAL_HEAT_METHOD_3_HEAT_METHOD_3_H
+#ifndef CGAL_HEAT_METHOD_3_SURFACE_MESH_GEODESIC_DISTANCES_3_H
+#define CGAL_HEAT_METHOD_3_SURFACE_MESH_GEODESIC_DISTANCES_3_H
 
 #include <CGAL/license/Heat_method_3.h>
 #include <CGAL/Heat_method_3/Intrinsic_Delaunay_triangulation_3.h>
@@ -914,4 +914,4 @@ estimate_geodesic_distances(const TriangleMesh& tm,
 } // namespace CGAL
 
 #include <CGAL/enable_warnings.h>
-#endif // CGAL_HEAT_METHOD_3_HEAT_METHOD_3_H
+#endif // CGAL_HEAT_METHOD_3_SURFACE_MESH_GEODESIC_DISTANCES_3_H