diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_APSS_plugin_cgal_code.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_APSS_plugin_cgal_code.cpp
index 3fbc1e2b446..d24478d3fcd 100644
--- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_APSS_plugin_cgal_code.cpp
+++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_APSS_plugin_cgal_code.cpp
@@ -12,10 +12,10 @@
 #include <CGAL/Surface_mesh_default_triangulation_3.h>
 #include <CGAL/make_surface_mesh.h>
 #include <CGAL/Implicit_surface_3.h>
+#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 // This package
 #include <CGAL/APSS_reconstruction_function.h>
-#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 
 // APSS implicit function
@@ -111,7 +111,7 @@ Polyhedron* APSS_reconstruct(const Point_set& points,
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option
diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
index 8c5396f05ab..7a994f3a7b0 100644
--- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
+++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/PS_demo_poisson_plugin_cgal_code.cpp
@@ -12,10 +12,10 @@
 #include <CGAL/Surface_mesh_default_triangulation_3.h>
 #include <CGAL/make_surface_mesh.h>
 #include <CGAL/Implicit_surface_3.h>
+#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 // This package
 #include <CGAL/Poisson_reconstruction_function.h>
-#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 
 // Poisson implicit function
@@ -123,7 +123,7 @@ Polyhedron* poisson_reconstruct(const Point_set& points,
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option
diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/APSS_reconstruction.cpp b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/APSS_reconstruction.cpp
index 11449434089..925dc948996 100644
--- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/APSS_reconstruction.cpp
+++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/APSS_reconstruction.cpp
@@ -251,7 +251,7 @@ int main(int argc, char * argv[])
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option
diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction.cpp b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction.cpp
index ea20efd151d..128fd09cb58 100644
--- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction.cpp
+++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/poisson_reconstruction.cpp
@@ -258,7 +258,7 @@ int main(int argc, char * argv[])
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option
diff --git a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/APSS_reconstruction_test.cpp b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/APSS_reconstruction_test.cpp
index 068e1035723..7503517cfd7 100644
--- a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/APSS_reconstruction_test.cpp
+++ b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/APSS_reconstruction_test.cpp
@@ -16,13 +16,13 @@
 #include <CGAL/Surface_mesh_default_triangulation_3.h>
 #include <CGAL/make_surface_mesh.h>
 #include <CGAL/Implicit_surface_3.h>
+#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 // This package
 #include <CGAL/APSS_reconstruction_function.h>
 #include <CGAL/Point_with_normal_3.h>
 #include <CGAL/property_map.h>
 #include <CGAL/IO/read_xyz_points.h>
-#include <CGAL/IO/output_surface_facets_to_polyhedron.h>
 
 #include "compute_normal.h"
 
@@ -252,7 +252,7 @@ int main(int argc, char * argv[])
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option
diff --git a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/poisson_reconstruction_test.cpp b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/poisson_reconstruction_test.cpp
index c9306396da5..23710ac7613 100644
--- a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/poisson_reconstruction_test.cpp
+++ b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/poisson_reconstruction_test.cpp
@@ -266,7 +266,7 @@ int main(int argc, char * argv[])
                       << "                    angle="<<sm_angle << " degrees,\n"
                       << "                    triangle size="<<sm_radius<<" * point set radius,\n"
                       << "                    distance="<<sm_distance<<" * p.s.r.,\n"
-                      << "                    Manifold_with_boundary_tag)\n"
+                      << "                    Manifold_tag)\n"
                       << "  where point set radius="<<radius<<"\n";
 
     // Generates surface mesh with manifold option