diff --git a/AABB_tree/doc/AABB_tree/PackageDescription.txt b/AABB_tree/doc/AABB_tree/PackageDescription.txt
index 4aea07e8e6a..e16cfc867d4 100644
--- a/AABB_tree/doc/AABB_tree/PackageDescription.txt
+++ b/AABB_tree/doc/AABB_tree/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAABBTreeRef AABB Tree Reference
+/// \defgroup PkgAABBTreeRef Reference Manual
 
 /// \defgroup PkgAABBTreeConcepts Concepts
 /// \ingroup PkgAABBTreeRef
diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
index a0df1f768f4..4799cda1813 100644
--- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
+++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAdvancingFrontSurfaceReconstructionRef Advancing Front Surface Reconstruction Reference
+/// \defgroup PkgAdvancingFrontSurfaceReconstructionRef Reference Manual
 
 /// \defgroup PkgAdvancingFrontSurfaceReconstructionRefConcepts Concepts
 /// \ingroup PkgAdvancingFrontSurfaceReconstructionRef
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt b/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
index 9e12449ab5b..7121abc1afd 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
+++ b/Algebraic_foundations/doc/Algebraic_foundations/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAlgebraicFoundationsRef Algebraic Foundations Reference
+/// \defgroup PkgAlgebraicFoundationsRef Reference Manual
 
 /// \defgroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts Concepts
 /// \ingroup PkgAlgebraicFoundationsRef
diff --git a/Algebraic_kernel_d/doc/Algebraic_kernel_d/PackageDescription.txt b/Algebraic_kernel_d/doc/Algebraic_kernel_d/PackageDescription.txt
index b8107073f4a..036c5761e5d 100644
--- a/Algebraic_kernel_d/doc/Algebraic_kernel_d/PackageDescription.txt
+++ b/Algebraic_kernel_d/doc/Algebraic_kernel_d/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAlgebraicKernelDRef Algebraic Kernel Reference
+/// \defgroup PkgAlgebraicKernelDRef Reference Manual
 
 /// \defgroup PkgAlgebraicKernelDConcepts Concepts
 /// \ingroup PkgAlgebraicKernelDRef
diff --git a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
index 78941b31d7d..14ef6b83398 100644
--- a/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
+++ b/Alpha_shapes_2/doc/Alpha_shapes_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAlphaShapes2Ref 2D Alpha Shapes Reference
+/// \defgroup PkgAlphaShapes2Ref Reference Manual
 /// \defgroup PkgAlphaShapes2Concepts Concepts
 /// \ingroup PkgAlphaShapes2Ref
 
diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt b/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt
index 97bf10a844d..8b95b04ea7d 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAlphaShapes3Ref 3D Alpha Shapes Reference
+/// \defgroup PkgAlphaShapes3Ref Reference Manual
 /// \defgroup PkgAlphaShapes3Concepts Concepts
 /// \ingroup PkgAlphaShapes3Ref
 /*!
diff --git a/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt b/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
index 883ea17c9f3..328084ce9a8 100644
--- a/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
+++ b/Alpha_wrap_3/doc/Alpha_wrap_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgAlphaWrap3Ref 3D Alpha Wrapping
+/// \defgroup PkgAlphaWrap3Ref Reference Manual
 
 /// \defgroup AW3_free_functions_grp Free Functions
 /// Functions to create a wrap from point clouds, triangle soups, and triangle meshes.
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
index 102f019f68c..9f9d5909963 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgApolloniusGraph2Ref 2D Apollonius Graphs (Delaunay Graphs of Disks) Reference
+/// \defgroup PkgApolloniusGraph2Ref Reference Manual
 /// \defgroup PkgApolloniusGraph2Concepts Concepts
 /// \ingroup PkgApolloniusGraph2Ref
 /*!
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/PackageDescription.txt b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/PackageDescription.txt
index bae19005dc3..ea1b0b666e7 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/PackageDescription.txt
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgArrangementOnSurface2Ref 2D Arrangement Reference
+/// \defgroup PkgArrangementOnSurface2Ref Reference Manual
 
 /// \defgroup PkgArrangementOnSurface2Concepts Concepts
 /// \ingroup PkgArrangementOnSurface2Ref
diff --git a/BGL/doc/BGL/PackageDescription.txt b/BGL/doc/BGL/PackageDescription.txt
index 93687510006..57a92c68be7 100644
--- a/BGL/doc/BGL/PackageDescription.txt
+++ b/BGL/doc/BGL/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgBGLRef CGAL and the Boost Graph Library Reference
+/// \defgroup PkgBGLRef Reference Manual
 
 /*! \defgroup PkgBGLConcepts Concepts
  \ingroup PkgBGLRef
diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/PackageDescription.txt b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/PackageDescription.txt
index cb19750c5db..aa97705025b 100644
--- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/PackageDescription.txt
+++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/PackageDescription.txt
@@ -1,8 +1,5 @@
-namespace CGAL {
-namespace Barycentric_coordinates {
-
 /*!
-\defgroup PkgBarycentricCoordinates2Ref 2D Generalized Barycentric Coordinates Reference
+\defgroup PkgBarycentricCoordinates2Ref Reference Manual
 
 \defgroup PkgBarycentricCoordinates2RefConcepts Concepts
 \ingroup PkgBarycentricCoordinates2Ref
@@ -77,6 +74,3 @@ coordinates from the Package \ref PkgInterpolation2.}
 - `discrete_harmonic_coordinates_2()`
 - `boundary_coordinates_2()`
 */
-
-} /* namespace Barycentric_coordinates */
-} /* namespace CGAL */
diff --git a/Basic_viewer/doc/Basic_viewer/PackageDescription.txt b/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
index d90a773fed5..da2de3d1e9b 100644
--- a/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
+++ b/Basic_viewer/doc/Basic_viewer/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgBasicViewerRef Basic Viewer Reference
+/// \defgroup PkgBasicViewerRef Reference Manual
 
 /// \defgroup PkgBasicViewerConcepts Concepts
 /// \ingroup PkgBasicViewerRef
diff --git a/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt b/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt
index d9e29fbf99a..85f62d9ea35 100644
--- a/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt
+++ b/Boolean_set_operations_2/doc/Boolean_set_operations_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgBooleanSetOperations2Ref 2D Regularized Boolean Set-Operations Reference
+/// \defgroup PkgBooleanSetOperations2Ref Reference Manual
 /// \defgroup PkgBooleanSetOperations2Concepts Concepts
 /// \ingroup PkgBooleanSetOperations2Ref
 
diff --git a/Bounding_volumes/doc/Bounding_volumes/PackageDescription.txt b/Bounding_volumes/doc/Bounding_volumes/PackageDescription.txt
index 6777f112a5b..b4f9d89eb4b 100644
--- a/Bounding_volumes/doc/Bounding_volumes/PackageDescription.txt
+++ b/Bounding_volumes/doc/Bounding_volumes/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgBoundingVolumesRef Bounding Volumes Reference
+/// \defgroup PkgBoundingVolumesRef Reference Manual
 /// \defgroup PkgBoundingVolumesConcepts Concepts
 /// \ingroup PkgBoundingVolumesRef
 /*!
diff --git a/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt b/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
index e5adae34d21..80c0079f38b 100644
--- a/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
+++ b/Box_intersection_d/doc/Box_intersection_d/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgBoxIntersectionDRef Intersecting Sequences of dD Iso-oriented Boxes Reference
+/// \defgroup PkgBoxIntersectionDRef Reference Manual
 /// \defgroup PkgBoxIntersectionDConcepts Concepts
 /// \ingroup PkgBoxIntersectionDRef
 
diff --git a/CGAL_ipelets/doc/CGAL_ipelets/PackageDescription.txt b/CGAL_ipelets/doc/CGAL_ipelets/PackageDescription.txt
index 3f15baf90de..f46ea0dda8c 100644
--- a/CGAL_ipelets/doc/CGAL_ipelets/PackageDescription.txt
+++ b/CGAL_ipelets/doc/CGAL_ipelets/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgCGALIpeletsRef CGAL Ipelets Reference
+/// \defgroup PkgCGALIpeletsRef Reference Manual
 /*!
 \addtogroup PkgCGALIpeletsRef
 \cgalPkgDescriptionBegin{CGAL Ipelets,PkgCGALIpelets}
diff --git a/Circular_kernel_2/doc/Circular_kernel_2/PackageDescription.txt b/Circular_kernel_2/doc/Circular_kernel_2/PackageDescription.txt
index 3092d4092ba..75052441fab 100644
--- a/Circular_kernel_2/doc/Circular_kernel_2/PackageDescription.txt
+++ b/Circular_kernel_2/doc/Circular_kernel_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgCircularKernel2Ref 2D Circular Geometry Kernel Reference
+/// \defgroup PkgCircularKernel2Ref Reference Manual
 
 /// \defgroup PkgCircularKernel2GeometricConcepts Geometric Concepts
 /// \ingroup PkgCircularKernel2Ref
diff --git a/Circular_kernel_3/doc/Circular_kernel_3/PackageDescription.txt b/Circular_kernel_3/doc/Circular_kernel_3/PackageDescription.txt
index 5f1aa8ea9a6..3df6588762b 100644
--- a/Circular_kernel_3/doc/Circular_kernel_3/PackageDescription.txt
+++ b/Circular_kernel_3/doc/Circular_kernel_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgCircularKernel3Ref 3D Spherical Geometry Kernel Reference
+/// \defgroup PkgCircularKernel3Ref Reference Manual
 
 /// \defgroup PkgCircularKernel3GeometricConcepts Geometric Concepts
 /// \ingroup PkgCircularKernel3Ref
diff --git a/Circulator/doc/Circulator/PackageDescription.txt b/Circulator/doc/Circulator/PackageDescription.txt
index 4f6971cd65b..bcff8470c4e 100644
--- a/Circulator/doc/Circulator/PackageDescription.txt
+++ b/Circulator/doc/Circulator/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgHandlesAndCirculatorsRef Handles and Circulators Reference
+/// \defgroup PkgHandlesAndCirculatorsRef Reference Manual
 /// \defgroup PkgHandlesAndCirculatorsConcepts Concepts
 /// \ingroup PkgHandlesAndCirculatorsRef
 
diff --git a/Classification/doc/Classification/PackageDescription.txt b/Classification/doc/Classification/PackageDescription.txt
index 24784495683..94ae4dcaec4 100644
--- a/Classification/doc/Classification/PackageDescription.txt
+++ b/Classification/doc/Classification/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgClassificationRef Classification Reference
+/// \defgroup PkgClassificationRef Reference Manual
 
 /*!
 \defgroup PkgClassificationConcepts Concepts
diff --git a/Combinatorial_map/doc/Combinatorial_map/PackageDescription.txt b/Combinatorial_map/doc/Combinatorial_map/PackageDescription.txt
index 202866c0046..5016a763697 100644
--- a/Combinatorial_map/doc/Combinatorial_map/PackageDescription.txt
+++ b/Combinatorial_map/doc/Combinatorial_map/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgCombinatorialMapsRef Combinatorial Maps Reference
+/// \defgroup PkgCombinatorialMapsRef Reference Manual
 
 /// \defgroup PkgCombinatorialMapsConcepts Concepts
 /// \ingroup PkgCombinatorialMapsRef
diff --git a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
index 6b59b805a38..9460f5d6fef 100644
--- a/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
+++ b/Cone_spanners_2/doc/Cone_spanners_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgConeSpanners2Ref Cone-Based Spanners Reference
+/// \defgroup PkgConeSpanners2Ref Reference Manual
 
 /*!
 \addtogroup PkgConeSpanners2Ref
diff --git a/Convex_decomposition_3/doc/Convex_decomposition_3/PackageDescription.txt b/Convex_decomposition_3/doc/Convex_decomposition_3/PackageDescription.txt
index 2e386901cca..fac4f8479c7 100644
--- a/Convex_decomposition_3/doc/Convex_decomposition_3/PackageDescription.txt
+++ b/Convex_decomposition_3/doc/Convex_decomposition_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgConvexDecomposition3Ref Convex Decomposition of Polyhedra Reference
+/// \defgroup PkgConvexDecomposition3Ref Reference Manual
 
 /*!
 \addtogroup PkgConvexDecomposition3Ref
diff --git a/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt b/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
index 7fa7625b04f..8a0e81aa648 100644
--- a/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
+++ b/Convex_hull_2/doc/Convex_hull_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgConvexHull2Ref 2D Convex Hulls and Extreme Points Reference
+/// \defgroup PkgConvexHull2Ref Reference Manual
 
 /// \defgroup PkgConvexHull2Concepts Concepts
 /// \ingroup PkgConvexHull2Ref
diff --git a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
index 17134ef6c71..f8530e90c99 100644
--- a/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
+++ b/Convex_hull_3/doc/Convex_hull_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgConvexHull3Ref 3D Convex Hulls Reference
+/// \defgroup PkgConvexHull3Ref Reference Manual
 
 /// \defgroup PkgConvexHull3Concepts Concepts
 /// \ingroup PkgConvexHull3Ref
diff --git a/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt b/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
index bf45d7bfeb3..2d9f3b16163 100644
--- a/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
+++ b/Convex_hull_d/doc/Convex_hull_d/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgConvexHullDRef dD Convex Hulls and Delaunay Triangulations Reference
+/// \defgroup PkgConvexHullDRef Reference Manual
 /// \defgroup PkgConvexHullDConcepts Concepts
 /// \ingroup PkgConvexHullDRef
 /*!
diff --git a/Envelope_2/doc/Envelope_2/PackageDescription.txt b/Envelope_2/doc/Envelope_2/PackageDescription.txt
index 0fe4c06e4ea..c4da5cd042e 100644
--- a/Envelope_2/doc/Envelope_2/PackageDescription.txt
+++ b/Envelope_2/doc/Envelope_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgEnvelope2Ref 2D Envelopes Reference
+/// \defgroup PkgEnvelope2Ref Reference Manual
 /// \defgroup PkgEnvelope2Concepts Concepts
 /// \ingroup PkgEnvelope2Ref
 /*!
diff --git a/Envelope_3/doc/Envelope_3/PackageDescription.txt b/Envelope_3/doc/Envelope_3/PackageDescription.txt
index 920f6b7054b..bbaa343b150 100644
--- a/Envelope_3/doc/Envelope_3/PackageDescription.txt
+++ b/Envelope_3/doc/Envelope_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgEnvelope3Ref 3D Envelopes Reference
+/// \defgroup PkgEnvelope3Ref Reference Manual
 /// \defgroup PkgEnvelope3Concepts Concepts
 /// \ingroup PkgEnvelope3Ref
 /*!
diff --git a/Generalized_map/doc/Generalized_map/PackageDescription.txt b/Generalized_map/doc/Generalized_map/PackageDescription.txt
index 1d3b4236aaf..5d583be2db0 100644
--- a/Generalized_map/doc/Generalized_map/PackageDescription.txt
+++ b/Generalized_map/doc/Generalized_map/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgGeneralizedMapsRef Generalized Maps Reference
+/// \defgroup PkgGeneralizedMapsRef Reference Manual
 
 /// \defgroup PkgGeneralizedMapsConcepts Concepts
 /// \ingroup PkgGeneralizedMapsRef
diff --git a/Generator/doc/Generator/PackageDescription.txt b/Generator/doc/Generator/PackageDescription.txt
index efee2250337..361419d9c33 100644
--- a/Generator/doc/Generator/PackageDescription.txt
+++ b/Generator/doc/Generator/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgGeneratorsRef Geometric Object Generators Reference
+/// \defgroup PkgGeneratorsRef Reference Manual
 /// \defgroup PkgGeneratorsConcepts Concepts
 /// \ingroup PkgGeneratorsRef
 /*!
diff --git a/GraphicsView/doc/GraphicsView/PackageDescription.txt b/GraphicsView/doc/GraphicsView/PackageDescription.txt
index 3c32ad7863c..b95109777fc 100644
--- a/GraphicsView/doc/GraphicsView/PackageDescription.txt
+++ b/GraphicsView/doc/GraphicsView/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgGraphicsViewRef CGAL and the Qt Graphics View Framework Reference
+/// \defgroup PkgGraphicsViewRef Reference Manual
 /// \defgroup PkgGraphicsViewGraphicsItemClasses Graphics Item Classes
 /// \ingroup PkgGraphicsViewRef
 /// \defgroup PkgGraphicsViewInputClasses Input Classes
diff --git a/HalfedgeDS/doc/HalfedgeDS/PackageDescription.txt b/HalfedgeDS/doc/HalfedgeDS/PackageDescription.txt
index ea6800cd6b1..64f9a951f2a 100644
--- a/HalfedgeDS/doc/HalfedgeDS/PackageDescription.txt
+++ b/HalfedgeDS/doc/HalfedgeDS/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgHalfedgeDSRef Halfedge Data Structures Reference
+/// \defgroup PkgHalfedgeDSRef Reference Manual
 /// \defgroup PkgHalfedgeDSConcepts Concepts
 /// \ingroup PkgHalfedgeDSRef
 
diff --git a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
index 524591e2d7f..92c1ce5ee76 100644
--- a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
+++ b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt
@@ -1,6 +1,4 @@
-// The Heat Method
-
-/// \defgroup PkgHeatMethodRef Heat Method Reference
+/// \defgroup PkgHeatMethodRef Reference Manual
 
 /// \defgroup PkgHeatMethodConcepts Concepts
 /// \ingroup PkgHeatMethodRef
diff --git a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
index eb96082b7c3..c347636ff34 100644
--- a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
+++ b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgHyperbolicTriangulation2Ref 2D Hyperbolic Delaunay Triangulations Reference
+/// \defgroup PkgHyperbolicTriangulation2Ref Reference Manual
 
 /// \defgroup PkgHyperbolicTriangulation2Concepts Concepts
 /// \ingroup PkgHyperbolicTriangulation2Ref
diff --git a/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt b/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
index aa77a9b9cc9..23a9b6d97dc 100644
--- a/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
+++ b/Inscribed_areas/doc/Inscribed_areas/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgInscribedAreasRef Inscribed Areas Reference
+/// \defgroup PkgInscribedAreasRef Reference Manual
 
 /// \defgroup PkgInscribedAreasConcepts Concepts
 /// \ingroup PkgInscribedAreasRef
diff --git a/Interpolation/doc/Interpolation/PackageDescription.txt b/Interpolation/doc/Interpolation/PackageDescription.txt
index 3800f5a9ccf..f76c55d40ee 100644
--- a/Interpolation/doc/Interpolation/PackageDescription.txt
+++ b/Interpolation/doc/Interpolation/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgInterpolation2Ref 2D and Surface Function Interpolation Reference
+/// \defgroup PkgInterpolation2Ref Reference Manual
 
 /// \defgroup PkgInterpolation2Concepts Concepts
 /// \ingroup PkgInterpolation2Ref
diff --git a/Interval_skip_list/doc/Interval_skip_list/PackageDescription.txt b/Interval_skip_list/doc/Interval_skip_list/PackageDescription.txt
index e7db8cc6251..556d5c7b115 100644
--- a/Interval_skip_list/doc/Interval_skip_list/PackageDescription.txt
+++ b/Interval_skip_list/doc/Interval_skip_list/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgIntervalSkipListRef Interval Skip List Reference
+/// \defgroup PkgIntervalSkipListRef Reference Manual
 /// \defgroup PkgIntervalSkipListConcepts Concepts
 /// \ingroup PkgIntervalSkipListRef
 /*!
diff --git a/Isosurfacing_3/doc/Isosurfacing_3/PackageDescription.txt b/Isosurfacing_3/doc/Isosurfacing_3/PackageDescription.txt
index c7df5e6b418..0a74fe28740 100644
--- a/Isosurfacing_3/doc/Isosurfacing_3/PackageDescription.txt
+++ b/Isosurfacing_3/doc/Isosurfacing_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgIsosurfacing3Ref 3D Isosurfacing Reference
+/// \defgroup PkgIsosurfacing3Ref Reference Manual
 /// \defgroup PkgIsosurfacing3Concepts Concepts
 /// \ingroup PkgIsosurfacing3Ref
 
diff --git a/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt b/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
index 90af6ff6785..2074cb659b3 100644
--- a/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
+++ b/Jet_fitting_3/doc/Jet_fitting_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgJetFitting3Ref Estimation of Local Differential Properties  of Point-Sampled Surfaces Reference
+/// \defgroup PkgJetFitting3Ref Reference Manual
 /// \defgroup PkgJetFitting3Concepts Concepts
 /// \ingroup PkgJetFitting3Ref
 /*!
diff --git a/Kernel_23/doc/Kernel_23/PackageDescription.txt b/Kernel_23/doc/Kernel_23/PackageDescription.txt
index 71f339fd082..f9b9d6991e7 100644
--- a/Kernel_23/doc/Kernel_23/PackageDescription.txt
+++ b/Kernel_23/doc/Kernel_23/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgKernel23Ref 2D and 3D Linear Geometry Kernel Reference
+/// \defgroup PkgKernel23Ref Reference Manual
 
 /// \defgroup PkgKernel23Concepts Concepts
 /// \ingroup PkgKernel23Ref
diff --git a/Kernel_d/doc/Kernel_d/PackageDescription.txt b/Kernel_d/doc/Kernel_d/PackageDescription.txt
index 783f291db01..106d47cb7bf 100644
--- a/Kernel_d/doc/Kernel_d/PackageDescription.txt
+++ b/Kernel_d/doc/Kernel_d/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgKernelDRef dD Geometry Kernel Reference
+/// \defgroup PkgKernelDRef Reference Manual
 
 /// \defgroup PkgKernelDLinAlgConcepts Linear Algebra Concepts
 /// \ingroup PkgKernelDRef
diff --git a/Kinetic_space_partition/doc/Kinetic_space_partition/PackageDescription.txt b/Kinetic_space_partition/doc/Kinetic_space_partition/PackageDescription.txt
index c0e9c21b476..80b03cbd7c4 100644
--- a/Kinetic_space_partition/doc/Kinetic_space_partition/PackageDescription.txt
+++ b/Kinetic_space_partition/doc/Kinetic_space_partition/PackageDescription.txt
@@ -1,5 +1,5 @@
 /*!
-\defgroup PkgKineticSpacePartitionRef Kinetic Space Partition Reference
+\defgroup PkgKineticSpacePartitionRef Reference Manual
 
 \defgroup PkgKineticSpacePartitionConcepts Concepts
 \ingroup PkgKineticSpacePartitionRef
diff --git a/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/PackageDescription.txt b/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/PackageDescription.txt
index 02fae11525d..4ca51b048d4 100644
--- a/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/PackageDescription.txt
+++ b/Kinetic_surface_reconstruction/doc/Kinetic_surface_reconstruction/PackageDescription.txt
@@ -1,5 +1,5 @@
 /*!
-\defgroup PkgKineticSurfaceReconstructionRef Kinetic Surface Reconstruction Reference
+\defgroup PkgKineticSurfaceReconstructionRef Reference Manual
 
 \addtogroup PkgKineticSurfaceReconstructionRef
 \cgalPkgDescriptionBegin{Kinetic Surface Reconstruction, PkgKineticSurfaceReconstruction}
diff --git a/Linear_cell_complex/doc/Linear_cell_complex/PackageDescription.txt b/Linear_cell_complex/doc/Linear_cell_complex/PackageDescription.txt
index a9ead2ceac0..caf7173fbee 100644
--- a/Linear_cell_complex/doc/Linear_cell_complex/PackageDescription.txt
+++ b/Linear_cell_complex/doc/Linear_cell_complex/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgLinearCellComplexRef Linear Cell Complex Reference
+/// \defgroup PkgLinearCellComplexRef Reference Manual
 
 /// \defgroup PkgLinearCellComplexConcepts Concepts
 /// \ingroup PkgLinearCellComplexRef
diff --git a/Matrix_search/doc/Matrix_search/PackageDescription.txt b/Matrix_search/doc/Matrix_search/PackageDescription.txt
index 1dabc40e68c..660f5a3ad66 100644
--- a/Matrix_search/doc/Matrix_search/PackageDescription.txt
+++ b/Matrix_search/doc/Matrix_search/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgMatrixSearchRef Monotone and Sorted Matrix Search Reference
+/// \defgroup PkgMatrixSearchRef Reference Manual
 
 /// \defgroup PkgMatrixSearchConcepts Concepts
 /// \ingroup PkgMatrixSearchRef
diff --git a/Mesh_2/doc/Mesh_2/PackageDescription.txt b/Mesh_2/doc/Mesh_2/PackageDescription.txt
index 458e3bf6b05..4b68cc1389c 100644
--- a/Mesh_2/doc/Mesh_2/PackageDescription.txt
+++ b/Mesh_2/doc/Mesh_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgMesh2Ref 2D Conforming Triangulations and Meshes Reference
+/// \defgroup PkgMesh2Ref Reference Manual
 
 /// \defgroup PkgMesh2Concepts Concepts
 /// \ingroup PkgMesh2Ref
diff --git a/Mesh_3/doc/Mesh_3/PackageDescription.txt b/Mesh_3/doc/Mesh_3/PackageDescription.txt
index 926491fc627..9de466df99f 100644
--- a/Mesh_3/doc/Mesh_3/PackageDescription.txt
+++ b/Mesh_3/doc/Mesh_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgMesh3Ref 3D Mesh Generation Reference
+/// \defgroup PkgMesh3Ref Reference Manual
 
 /// \defgroup PkgMesh3Concepts Main Concepts
 /// \ingroup PkgMesh3Ref
diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
index bb770a24620..d2d6d6199d6 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgMinkowskiSum2Ref 2D Minkowski Sums Reference
+/// \defgroup PkgMinkowskiSum2Ref Reference Manual
 /// \defgroup PkgMinkowskiSum2Concepts Concepts
 /// \ingroup PkgMinkowskiSum2Ref
 
diff --git a/Minkowski_sum_3/doc/Minkowski_sum_3/PackageDescription.txt b/Minkowski_sum_3/doc/Minkowski_sum_3/PackageDescription.txt
index 5f467e1e05f..2e41020ef53 100644
--- a/Minkowski_sum_3/doc/Minkowski_sum_3/PackageDescription.txt
+++ b/Minkowski_sum_3/doc/Minkowski_sum_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgMinkowskiSum3Ref 3D Minkowski Sum of Polyhedra Reference
+/// \defgroup PkgMinkowskiSum3Ref Reference Manual
 
 /*!
 \addtogroup PkgMinkowskiSum3Ref
diff --git a/Miscellany/doc/Miscellany/PackageDescription.txt b/Miscellany/doc/Miscellany/PackageDescription.txt
index a4fbd2da549..c3795981dd9 100644
--- a/Miscellany/doc/Miscellany/PackageDescription.txt
+++ b/Miscellany/doc/Miscellany/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup MiscellanyRef Profiling Tools, Hash Map, Union-find, Modifiers Reference
+/// \defgroup MiscellanyRef Reference Manual
 /// \defgroup MiscellanyConcepts Concepts
 /// \ingroup MiscellanyRef
 /*!
diff --git a/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt b/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
index 0d7b0e90757..a13c67cfbde 100644
--- a/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
+++ b/Modular_arithmetic/doc/Modular_arithmetic/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgModularArithmeticRef Modular Arithmetic Reference
+/// \defgroup PkgModularArithmeticRef Reference Manual
 /// \defgroup PkgModularArithmeticConcepts Concepts
 /// \ingroup PkgModularArithmeticRef
 /*!
diff --git a/Nef_2/doc/Nef_2/PackageDescription.txt b/Nef_2/doc/Nef_2/PackageDescription.txt
index 431ae610e7c..43c958c43ef 100644
--- a/Nef_2/doc/Nef_2/PackageDescription.txt
+++ b/Nef_2/doc/Nef_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgNef2Ref 2D Boolean Operations on Nef Polygons Reference
+/// \defgroup PkgNef2Ref Reference Manual
 /// \defgroup PkgNef2Concepts Concepts
 /// \ingroup PkgNef2Ref
 /*!
diff --git a/Nef_3/doc/Nef_3/PackageDescription.txt b/Nef_3/doc/Nef_3/PackageDescription.txt
index 6f591bcfb6c..392c4b3c75c 100644
--- a/Nef_3/doc/Nef_3/PackageDescription.txt
+++ b/Nef_3/doc/Nef_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgNef3Ref 3D Boolean Operations on  Nef Polyhedra Reference
+/// \defgroup PkgNef3Ref Reference Manual
 ///
 /// \defgroup PkgNef3IOFunctions I/O Functions
 /// \ingroup PkgNef3Ref
diff --git a/Nef_S2/doc/Nef_S2/PackageDescription.txt b/Nef_S2/doc/Nef_S2/PackageDescription.txt
index f85581381e8..5cc86eb32f7 100644
--- a/Nef_S2/doc/Nef_S2/PackageDescription.txt
+++ b/Nef_S2/doc/Nef_S2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgNefS2Ref 2D Boolean Operations on Nef Polygons Embedded on the Sphere Reference
+/// \defgroup PkgNefS2Ref Reference Manual
 /*!
 \addtogroup PkgNefS2Ref
 
diff --git a/Number_types/doc/Number_types/PackageDescription.txt b/Number_types/doc/Number_types/PackageDescription.txt
index ba551f7c153..91898eddb5b 100644
--- a/Number_types/doc/Number_types/PackageDescription.txt
+++ b/Number_types/doc/Number_types/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgNumberTypesRef Number Types Reference
+/// \defgroup PkgNumberTypesRef Reference Manual
 
 /// \defgroup PkgNumberTypesConcepts Concepts
 /// \ingroup PkgNumberTypesRef
diff --git a/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt b/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
index 994cb41bbef..b332dd4494d 100644
--- a/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
+++ b/Optimal_bounding_box/doc/Optimal_bounding_box/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgOptimalBoundingBoxRef Optimal Bounding Box Reference
+/// \defgroup PkgOptimalBoundingBoxRef Reference Manual
 
 /// \defgroup PkgOptimalBoundingBoxConcepts Concepts
 /// \ingroup PkgOptimalBoundingBoxRef
diff --git a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
index 66636bca10b..3bd06554ae3 100644
--- a/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
+++ b/Optimal_transportation_reconstruction_2/doc/Optimal_transportation_reconstruction_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgOptimalTransportationReconstruction2Ref Optimal Transportation Curve Reconstruction Reference
+/// \defgroup PkgOptimalTransportationReconstruction2Ref Reference Manual
 
 /// \defgroup PkgOptimalTransportationReconstruction2Concepts Concepts
 /// \ingroup PkgOptimalTransportationReconstruction2Ref
diff --git a/Orthtree/doc/Orthtree/PackageDescription.txt b/Orthtree/doc/Orthtree/PackageDescription.txt
index 98825d8e237..a39a141f81c 100644
--- a/Orthtree/doc/Orthtree/PackageDescription.txt
+++ b/Orthtree/doc/Orthtree/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgOrthtreeRef Quadtrees, Octrees and Orthtrees Reference
+/// \defgroup PkgOrthtreeRef Reference Manual
 Quadtree, Octree and Orthtree Reference
 
 /// \defgroup PkgOrthtreeConcepts Concepts
diff --git a/Partition_2/doc/Partition_2/PackageDescription.txt b/Partition_2/doc/Partition_2/PackageDescription.txt
index 2d33fd123ce..c97c815c64d 100644
--- a/Partition_2/doc/Partition_2/PackageDescription.txt
+++ b/Partition_2/doc/Partition_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPartition2Ref 2D Polygon Partitioning Reference
+/// \defgroup PkgPartition2Ref Reference Manual
 /// \defgroup PkgPartition2Concepts Concepts
 /// \ingroup PkgPartition2Ref
 /// \defgroup PkgPartition2FunctionObjectConcepts Function Object Concepts
diff --git a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/PackageDescription.txt b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/PackageDescription.txt
index 3c527f6fdd2..39c580cff30 100644
--- a/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/PackageDescription.txt
+++ b/Periodic_2_triangulation_2/doc/Periodic_2_triangulation_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPeriodic2Triangulation2Ref 2D Periodic Triangulations Reference
+/// \defgroup PkgPeriodic2Triangulation2Ref Reference Manual
 
 /// \defgroup PkgPeriodic2Triangulation2Concepts Concepts
 /// \ingroup PkgPeriodic2Triangulation2Ref
diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/PackageDescription.txt b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/PackageDescription.txt
index f93700399ec..c42bc7a74b6 100644
--- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/PackageDescription.txt
+++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPeriodic3Mesh3Ref 3D Periodic Mesh Generation Reference
+/// \defgroup PkgPeriodic3Mesh3Ref Reference Manual
 
 /// \defgroup PkgPeriodic3Mesh3Concepts Concepts
 /// \ingroup PkgPeriodic3Mesh3Ref
diff --git a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt
index fefa62fa8f6..8d219074e05 100644
--- a/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt
+++ b/Periodic_3_triangulation_3/doc/Periodic_3_triangulation_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPeriodic3Triangulation3Ref 3D Periodic Triangulations Reference
+/// \defgroup PkgPeriodic3Triangulation3Ref Reference Manual
 
 /// \defgroup PkgPeriodic3Triangulation3Concepts Concepts
 /// \ingroup PkgPeriodic3Triangulation3Ref
diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
index f5b7200ee7e..3709d89b78b 100644
--- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPeriodic4HyperbolicTriangulation2Ref 2D Periodic Hyperbolic Triangulations Reference
+/// \defgroup PkgPeriodic4HyperbolicTriangulation2Ref Reference Manual
 
 /// \defgroup PkgPeriodic4HyperbolicTriangulation2Concepts Concepts
 /// \ingroup PkgPeriodic4HyperbolicTriangulation2Ref
diff --git a/Point_set_2/doc/Point_set_2/PackageDescription.txt b/Point_set_2/doc/Point_set_2/PackageDescription.txt
index bf3a90fd689..2bd3b84c548 100644
--- a/Point_set_2/doc/Point_set_2/PackageDescription.txt
+++ b/Point_set_2/doc/Point_set_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPointSet2Ref 2D Range and Neighbor Search Reference
+/// \defgroup PkgPointSet2Ref Reference Manual
 /// \defgroup PkgPointSet2Concepts Concepts
 /// \ingroup PkgPointSet2Ref
 
diff --git a/Point_set_3/doc/Point_set_3/PackageDescription.txt b/Point_set_3/doc/Point_set_3/PackageDescription.txt
index 78599903870..ff2bbcbc02e 100644
--- a/Point_set_3/doc/Point_set_3/PackageDescription.txt
+++ b/Point_set_3/doc/Point_set_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPointSet3Ref 3D Point Set Reference
+/// \defgroup PkgPointSet3Ref Reference Manual
 
 /*!
 \cgalInclude{CGAL/draw_point_set_3.h}
diff --git a/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt b/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
index 7107d1bd198..f351e426e8f 100644
--- a/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
+++ b/Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPointSetProcessing3Ref Point Set Processing Reference
+/// \defgroup PkgPointSetProcessing3Ref Reference Manual
 
 /*!
 \defgroup PkgPointSetProcessing3Algorithms Algorithms
diff --git a/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt b/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
index 8aee390473b..7cc67812dbd 100644
--- a/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
+++ b/Poisson_surface_reconstruction_3/doc/Poisson_surface_reconstruction_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPoissonSurfaceReconstruction3Ref Poisson Surface Reconstruction Reference
+/// \defgroup PkgPoissonSurfaceReconstruction3Ref Reference Manual
 /*!
 \addtogroup PkgPoissonSurfaceReconstruction3Ref
 \cgalPkgDescriptionBegin{Poisson Surface Reconstruction,PkgPoissonSurfaceReconstruction3}
diff --git a/Polygon/doc/Polygon/PackageDescription.txt b/Polygon/doc/Polygon/PackageDescription.txt
index 8083eb8e15b..a96bb2c8d32 100644
--- a/Polygon/doc/Polygon/PackageDescription.txt
+++ b/Polygon/doc/Polygon/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolygon2Ref 2D Polygon Reference
+/// \defgroup PkgPolygon2Ref Reference Manual
 
 /// \defgroup PkgPolygon2Concepts Concepts
 /// \ingroup PkgPolygon2Ref
diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
index 39b10beabe1..700ec7fdac0 100644
--- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
+++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolygonMeshProcessingRef Polygon Mesh Processing Reference
+/// \defgroup PkgPolygonMeshProcessingRef Reference Manual
 /// \defgroup PkgPolygonMeshProcessingConcepts Concepts
 /// \ingroup PkgPolygonMeshProcessingRef
 
diff --git a/Polygon_repair/doc/Polygon_repair/PackageDescription.txt b/Polygon_repair/doc/Polygon_repair/PackageDescription.txt
index 3a311dd0cd1..78767d4cf18 100644
--- a/Polygon_repair/doc/Polygon_repair/PackageDescription.txt
+++ b/Polygon_repair/doc/Polygon_repair/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolygonRepairRef 2D Polygon Repair Reference
+/// \defgroup PkgPolygonRepairRef Reference Manual
 
 /// \defgroup PkgPolygonRepairFunctions Functions
 /// \ingroup PkgPolygonRepairRef
diff --git a/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt b/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
index 2bbf0b19b6e..467b75bb0fd 100644
--- a/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
+++ b/Polygonal_surface_reconstruction/doc/Polygonal_surface_reconstruction/PackageDescription.txt
@@ -1,6 +1,4 @@
-// Polygonal Surface Reconstruction should equal the project title in Doxyfile.in
-
-/// \defgroup PkgPolygonalSurfaceReconstructionRef Polygonal Surface Reconstruction Reference
+/// \defgroup PkgPolygonalSurfaceReconstructionRef Reference Manual
 
 /*!
 \addtogroup PkgPolygonalSurfaceReconstructionRef
diff --git a/Polyhedron/doc/Polyhedron/PackageDescription.txt b/Polyhedron/doc/Polyhedron/PackageDescription.txt
index f0033c7efd7..27cc5bcbd99 100644
--- a/Polyhedron/doc/Polyhedron/PackageDescription.txt
+++ b/Polyhedron/doc/Polyhedron/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolyhedronRef 3D Polyhedral Surface  Reference
+/// \defgroup PkgPolyhedronRef Reference Manual
 /// \defgroup PkgPolyhedronConcepts Concepts
 /// \ingroup PkgPolyhedronRef
 
diff --git a/Polyline_simplification_2/doc/Polyline_simplification_2/PackageDescription.txt b/Polyline_simplification_2/doc/Polyline_simplification_2/PackageDescription.txt
index 8944dbadbb8..26d18b9d541 100644
--- a/Polyline_simplification_2/doc/Polyline_simplification_2/PackageDescription.txt
+++ b/Polyline_simplification_2/doc/Polyline_simplification_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolylineSimplification2Ref 2D Polyline Simplification Reference
+/// \defgroup PkgPolylineSimplification2Ref Reference Manual
 /// \defgroup PkgPolylineSimplification2Concepts Concepts
 /// \ingroup PkgPolylineSimplification2Ref
 
diff --git a/Polynomial/doc/Polynomial/PackageDescription.txt b/Polynomial/doc/Polynomial/PackageDescription.txt
index 96273a5ada8..929a91b02c6 100644
--- a/Polynomial/doc/Polynomial/PackageDescription.txt
+++ b/Polynomial/doc/Polynomial/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolynomialRef Polynomial Reference
+/// \defgroup PkgPolynomialRef Reference Manual
 /// \defgroup PkgPolynomialConcepts Concepts
 /// \ingroup PkgPolynomialRef
 
diff --git a/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt b/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt
index b49377cf9ed..d5284e50354 100644
--- a/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt
+++ b/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPolytopeDistanceDRef Optimal Distances Reference
+/// \defgroup PkgPolytopeDistanceDRef Reference Manual
 /// \defgroup PkgPolytopeDistanceDConcepts Concepts
 /// \ingroup PkgPolytopeDistanceDRef
 
diff --git a/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt b/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
index 03acad4f33b..de1e1e5a04e 100644
--- a/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
+++ b/Principal_component_analysis/doc/Principal_component_analysis/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPrincipalComponentAnalysisDRef Principal Component Analysis Reference
+/// \defgroup PkgPrincipalComponentAnalysisDRef Reference Manual
 
 /// \defgroup PkgPrincipalComponentAnalysisDBary CGAL::barycenter()
 /// \ingroup PkgPrincipalComponentAnalysisDRef
diff --git a/Property_map/doc/Property_map/PackageDescription.txt b/Property_map/doc/Property_map/PackageDescription.txt
index 0f52bd4e7b7..60fac46a48e 100644
--- a/Property_map/doc/Property_map/PackageDescription.txt
+++ b/Property_map/doc/Property_map/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgPropertyMapRef CGAL and Boost Property Maps Reference
+/// \defgroup PkgPropertyMapRef Reference Manual
 
 /*!
 \addtogroup PkgPropertyMapRef
diff --git a/QP_solver/doc/QP_solver/PackageDescription.txt b/QP_solver/doc/QP_solver/PackageDescription.txt
index 0da82f7f3b6..57e0e238589 100644
--- a/QP_solver/doc/QP_solver/PackageDescription.txt
+++ b/QP_solver/doc/QP_solver/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgQPSolverRef Linear and Quadratic Programming Solver Reference
+/// \defgroup PkgQPSolverRef Reference Manual
 
 /*! \defgroup PkgQPSolverConcepts Concepts
  \ingroup PkgQPSolverRef
diff --git a/Ridges_3/doc/Ridges_3/PackageDescription.txt b/Ridges_3/doc/Ridges_3/PackageDescription.txt
index 5c06986a879..388f5a534dc 100644
--- a/Ridges_3/doc/Ridges_3/PackageDescription.txt
+++ b/Ridges_3/doc/Ridges_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgRidges3Ref Approximation of Ridges and Umbilics on Triangulated Surface Meshes Reference
+/// \defgroup PkgRidges3Ref Reference Manual
 
 /// \defgroup PkgRidges3Enums Enums
 /// \ingroup PkgRidges3Ref
diff --git a/SMDS_3/doc/SMDS_3/PackageDescription.txt b/SMDS_3/doc/SMDS_3/PackageDescription.txt
index 7384e5682c0..c3d9d6d6cd8 100644
--- a/SMDS_3/doc/SMDS_3/PackageDescription.txt
+++ b/SMDS_3/doc/SMDS_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSMDS3Ref 3D Simplicial Mesh Data Structures Reference
+/// \defgroup PkgSMDS3Ref Reference Manual
 
 /// \defgroup PkgSMDS3Concepts Concepts
 /// \ingroup PkgSMDS3Ref
diff --git a/STL_Extension/doc/STL_Extension/PackageDescription.txt b/STL_Extension/doc/STL_Extension/PackageDescription.txt
index 266a3b15f52..1580d503f9d 100644
--- a/STL_Extension/doc/STL_Extension/PackageDescription.txt
+++ b/STL_Extension/doc/STL_Extension/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSTLExtensionRef STL Extensions for CGAL Reference
+/// \defgroup PkgSTLExtensionRef Reference Manual
 
 /// \defgroup PkgSTLExtensionConcepts Concepts
 /// \ingroup PkgSTLExtensionRef
diff --git a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
index 08d1f716eb2..a02396244c2 100644
--- a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
+++ b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgScaleSpaceReconstruction3Ref Scale-Space Surface Reconstruction Reference
+/// \defgroup PkgScaleSpaceReconstruction3Ref Reference Manual
 
 /// \defgroup PkgScaleSpaceReconstruction3Concepts Concepts
 /// \ingroup PkgScaleSpaceReconstruction3Ref
diff --git a/SearchStructures/doc/SearchStructures/PackageDescription.txt b/SearchStructures/doc/SearchStructures/PackageDescription.txt
index 3fdc12fd5b8..b912c17c53d 100644
--- a/SearchStructures/doc/SearchStructures/PackageDescription.txt
+++ b/SearchStructures/doc/SearchStructures/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSearchStructuresRef dD Range and Segment Trees Reference
+/// \defgroup PkgSearchStructuresRef Reference Manual
 /// \defgroup PkgSearchStructuresConcepts Concepts
 /// \ingroup PkgSearchStructuresRef
 
diff --git a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt
index 8db5cfb3b9b..d617f6ad2ef 100644
--- a/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt
+++ b/Segment_Delaunay_graph_2/doc/Segment_Delaunay_graph_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSegmentDelaunayGraph2Ref 2D Segment Delaunay Graphs Reference
+/// \defgroup PkgSegmentDelaunayGraph2Ref Reference Manual
 /// \defgroup PkgSegmentDelaunayGraph2Concepts Concepts
 /// \ingroup PkgSegmentDelaunayGraph2Ref
 /*!
diff --git a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
index 42096623238..c049367585b 100644
--- a/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
+++ b/Segment_Delaunay_graph_Linf_2/doc/Segment_Delaunay_graph_Linf_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSegmentDelaunayGraphLinf2Ref L Infinity Segment Delaunay Graphs Reference
+/// \defgroup PkgSegmentDelaunayGraphLinf2Ref Reference Manual
 /// \defgroup PkgSegmentDelaunayGraphLinf2Concepts Concepts
 /// \ingroup PkgSegmentDelaunayGraphLinf2Ref
 
diff --git a/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt b/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
index cf30ff00507..b5d6207296e 100644
--- a/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
+++ b/Set_movable_separability_2/doc/Set_movable_separability_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSetMovableSeparability2Ref 2D Movable Separability of Sets Reference
+/// \defgroup PkgSetMovableSeparability2Ref Reference Manual
 
 /// \defgroup top_edges_grp Top Edges
 /// These function determine whether a cavity (of a mold in the plane)
diff --git a/Shape_detection/doc/Shape_detection/PackageDescription.txt b/Shape_detection/doc/Shape_detection/PackageDescription.txt
index e1efc07b3dd..6e8530ce9f0 100644
--- a/Shape_detection/doc/Shape_detection/PackageDescription.txt
+++ b/Shape_detection/doc/Shape_detection/PackageDescription.txt
@@ -1,7 +1,5 @@
-
-// RANSAC
 /*!
-\defgroup PkgShapeDetectionRef Shape Detection Reference
+\defgroup PkgShapeDetectionRef Reference Manual
 
 \defgroup PkgShapeDetectionRANSAC Efficient RANSAC
 \ingroup PkgShapeDetectionRef
diff --git a/Shape_regularization/doc/Shape_regularization/PackageDescription.txt b/Shape_regularization/doc/Shape_regularization/PackageDescription.txt
index e274c857c40..f22c7cbe09c 100644
--- a/Shape_regularization/doc/Shape_regularization/PackageDescription.txt
+++ b/Shape_regularization/doc/Shape_regularization/PackageDescription.txt
@@ -1,8 +1,5 @@
-namespace CGAL {
-namespace Shape_regularization {
-
 /*!
-\defgroup PkgShapeRegularizationRef Shape Regularization Reference
+\defgroup PkgShapeRegularizationRef Reference Manual
 
 \defgroup PkgShapeRegularizationRefConcepts Concepts
 \ingroup PkgShapeRegularizationRef
@@ -100,6 +97,3 @@ to the user-specified conditions.}
 ### QP Regularization ###
 - `QP_regularization<GeomTraits, InputRange, NeighQuery, RegType, QPSolver>`
 */
-
-} /* namespace Shape_regularization */
-} /* namespace CGAL */
diff --git a/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt b/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt
index 2945d9f75b3..67f8d8a5b95 100644
--- a/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt
+++ b/Skin_surface_3/doc/Skin_surface_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSkinSurface3Ref 3D Skin Surface Meshing Reference
+/// \defgroup PkgSkinSurface3Ref Reference Manual
 /// \defgroup PkgSkinSurface3Concepts Concepts
 /// \ingroup PkgSkinSurface3Ref
 
diff --git a/Snap_rounding_2/doc/Snap_rounding_2/PackageDescription.txt b/Snap_rounding_2/doc/Snap_rounding_2/PackageDescription.txt
index 58e533bedcf..9426f5b4808 100644
--- a/Snap_rounding_2/doc/Snap_rounding_2/PackageDescription.txt
+++ b/Snap_rounding_2/doc/Snap_rounding_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSnapRounding2Ref 2D Snap Rounding Reference
+/// \defgroup PkgSnapRounding2Ref Reference Manual
 /// \defgroup PkgSnapRounding2Concepts Concepts
 /// \ingroup PkgSnapRounding2Ref
 /*!
diff --git a/Solver_interface/doc/Solver_interface/PackageDescription.txt b/Solver_interface/doc/Solver_interface/PackageDescription.txt
index 55f61bed124..6e6c1902cf0 100644
--- a/Solver_interface/doc/Solver_interface/PackageDescription.txt
+++ b/Solver_interface/doc/Solver_interface/PackageDescription.txt
@@ -1,5 +1,5 @@
 /*!
-\defgroup PkgSolverInterfaceRef CGAL and Solvers Reference
+\defgroup PkgSolverInterfaceRef Reference Manual
 
 \defgroup PkgSolverInterfaceConcepts Concepts
 \ingroup PkgSolverInterfaceRef
diff --git a/Spatial_searching/doc/Spatial_searching/PackageDescription.txt b/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
index 0ba29710374..bcd161d7cea 100644
--- a/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
+++ b/Spatial_searching/doc/Spatial_searching/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSpatialSearchingDRef dD Spatial Searching Reference
+/// \defgroup PkgSpatialSearchingDRef Reference Manual
 
 /// \defgroup PkgSpatialSearchingDConcepts Concepts
 /// \ingroup PkgSpatialSearchingDRef
diff --git a/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt b/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
index 0960831b264..2ccf6db8f73 100644
--- a/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
+++ b/Spatial_sorting/doc/Spatial_sorting/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSpatialSortingRef Spatial Sorting Reference
+/// \defgroup PkgSpatialSortingRef Reference Manual
 
 /// \defgroup PkgSpatialSortingConcepts Concepts
 /// \ingroup PkgSpatialSortingRef
diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt b/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt
index a035d036665..99b781303b2 100644
--- a/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt
+++ b/Straight_skeleton_2/doc/Straight_skeleton_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgStraightSkeleton2Ref 2D Straight Skeleton and Polygon Offsetting Reference
+/// \defgroup PkgStraightSkeleton2Ref Reference Manual
 /// \defgroup PkgStraightSkeleton2Concepts Concepts
 /// \ingroup PkgStraightSkeleton2Ref
 
diff --git a/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt b/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt
index 42733d78f85..9615a377a36 100644
--- a/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt
+++ b/Stream_lines_2/doc/Stream_lines_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgStreamLines2Ref 2D Placement of Streamlines Reference
+/// \defgroup PkgStreamLines2Ref Reference Manual
 /// \defgroup PkgStreamLines2Concepts Concepts
 /// \ingroup PkgStreamLines2Ref
 /*!
diff --git a/Stream_support/doc/Stream_support/PackageDescription.txt b/Stream_support/doc/Stream_support/PackageDescription.txt
index 0cacc80c631..2d97d36e3c1 100644
--- a/Stream_support/doc/Stream_support/PackageDescription.txt
+++ b/Stream_support/doc/Stream_support/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgStreamSupportRef I/O Streams Reference
+/// \defgroup PkgStreamSupportRef Reference Manual
 /// \defgroup IOstreamOperators Stream Operators
 /// \ingroup PkgStreamSupportRef
 /// \defgroup IOstreamFunctions I/O Functions
diff --git a/Subdivision_method_3/doc/Subdivision_method_3/PackageDescription.txt b/Subdivision_method_3/doc/Subdivision_method_3/PackageDescription.txt
index bdd1a46337c..efd456b9904 100644
--- a/Subdivision_method_3/doc/Subdivision_method_3/PackageDescription.txt
+++ b/Subdivision_method_3/doc/Subdivision_method_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceSubdivisionMethod3Ref 3D Surface Subdivision Methods Reference
+/// \defgroup PkgSurfaceSubdivisionMethod3Ref Reference Manual
 
 /// \defgroup PkgSurfaceSubdivisionMethod3Concepts Concepts
 /// \ingroup PkgSurfaceSubdivisionMethod3Ref
diff --git a/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt b/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
index 66ac1fb214e..2a262f74824 100644
--- a/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
+++ b/Surface_mesh_approximation/doc/Surface_mesh_approximation/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTSMARef Triangulated Surface Mesh Approximation Reference
+/// \defgroup PkgTSMARef Reference Manual
 
 /// \defgroup PkgTSMAConcepts Concepts
 /// \ingroup PkgTSMARef
diff --git a/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt b/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
index df5695c208e..aa0fa9f1f00 100644
--- a/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
+++ b/Surface_mesh_deformation/doc/Surface_mesh_deformation/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshDeformationRef Triangulated Surface Mesh Deformation Reference
+/// \defgroup PkgSurfaceMeshDeformationRef Reference Manual
 /// \defgroup PkgSurfaceMeshDeformationConcepts Concepts
 /// \ingroup PkgSurfaceMeshDeformationRef
 
diff --git a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
index d10f2b91ae6..61c216245e5 100644
--- a/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
+++ b/Surface_mesh_parameterization/doc/Surface_mesh_parameterization/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshParameterizationRef Triangulated Surface Mesh Parameterization Reference
+/// \defgroup PkgSurfaceMeshParameterizationRef Reference Manual
 
 
 /*!
diff --git a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
index 855dc4524ac..3fffb38be7a 100644
--- a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
+++ b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshSegmentationRef Triangulated Surface Mesh Segmentation Reference
+/// \defgroup PkgSurfaceMeshSegmentationRef Reference Manual
 
 /// \defgroup PkgSurfaceMeshSegmentationConcepts Concepts
 /// \ingroup PkgSurfaceMeshSegmentationRef
diff --git a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
index 185684bd3de..6c8c97b47e0 100644
--- a/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
+++ b/Surface_mesh_shortest_path/doc/Surface_mesh_shortest_path/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshShortestPathRef Triangulated Surface Mesh Geodesic Shortest Paths Reference
+/// \defgroup PkgSurfaceMeshShortestPathRef Reference Manual
 
 /// \defgroup PkgSurfaceMeshShortestPathConcepts Concepts
 /// \ingroup PkgSurfaceMeshShortestPathRef
diff --git a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
index da58a2534fc..a597bb02a77 100644
--- a/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
+++ b/Surface_mesh_simplification/doc/Surface_mesh_simplification/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshSimplificationRef Triangulated Surface Mesh Simplification Reference
+/// \defgroup PkgSurfaceMeshSimplificationRef Reference Manual
 /// \defgroup PkgSurfaceMeshSimplificationConcepts Concepts
 /// \ingroup PkgSurfaceMeshSimplificationRef
 /*!
diff --git a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
index 8de78b7f35f..6f3f5ca63fa 100644
--- a/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
+++ b/Surface_mesh_skeletonization/doc/Surface_mesh_skeletonization/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshSkeletonizationRef Triangulated Surface Mesh Skeletonization Reference
+/// \defgroup PkgSurfaceMeshSkeletonizationRef Reference Manual
 /// \defgroup PkgSurfaceMeshSkeletonizationConcepts Concepts
 /// \ingroup PkgSurfaceMeshSkeletonizationRef
 
diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
index b39b30e8f93..8a4a2b95f01 100644
--- a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
+++ b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMeshTopologyRef Surface Mesh Topology Reference
+/// \defgroup PkgSurfaceMeshTopologyRef Reference Manual
 
 /// \defgroup PkgSurfaceMeshTopologyConcepts Concepts
 /// \ingroup PkgSurfaceMeshTopologyRef
diff --git a/Surface_mesher/doc/Surface_mesher/PackageDescription.txt b/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
index 091d2399df4..6b4244d716b 100644
--- a/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
+++ b/Surface_mesher/doc/Surface_mesher/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceMesher3Ref 3D Surface Mesh Generation Reference
+/// \defgroup PkgSurfaceMesher3Ref Reference Manual
 
 /// \defgroup PkgSurfaceMesher3Concepts Concepts
 /// \ingroup PkgSurfaceMesher3Ref
diff --git a/Surface_sweep_2/doc/Surface_sweep_2/PackageDescription.txt b/Surface_sweep_2/doc/Surface_sweep_2/PackageDescription.txt
index 8f4d6fcc4d6..45a46c156a6 100644
--- a/Surface_sweep_2/doc/Surface_sweep_2/PackageDescription.txt
+++ b/Surface_sweep_2/doc/Surface_sweep_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgSurfaceSweep2Ref 2D Intersection of Curves Reference
+/// \defgroup PkgSurfaceSweep2Ref Reference Manual
 /*!
 \addtogroup PkgSurfaceSweep2Ref
 \cgalPkgDescriptionBegin{2D Intersection of Curves,PkgSurfaceSweep2}
diff --git a/TDS_2/doc/TDS_2/PackageDescription.txt b/TDS_2/doc/TDS_2/PackageDescription.txt
index 95af343936f..acec919a94d 100644
--- a/TDS_2/doc/TDS_2/PackageDescription.txt
+++ b/TDS_2/doc/TDS_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTDS2Ref 2D Triangulation Data Structure Reference
+/// \defgroup PkgTDS2Ref Reference Manual
 /// \defgroup PkgTDS2Concepts Concepts
 /// \ingroup PkgTDS2Ref
 /*!
diff --git a/TDS_3/doc/TDS_3/PackageDescription.txt b/TDS_3/doc/TDS_3/PackageDescription.txt
index 9f2efbc741f..b7f33ff29c3 100644
--- a/TDS_3/doc/TDS_3/PackageDescription.txt
+++ b/TDS_3/doc/TDS_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTDS3Ref 3D Triangulation Data Structure Reference
+/// \defgroup PkgTDS3Ref Reference Manual
 
 /// \defgroup PkgTDS3Concepts Concepts
 /// \ingroup PkgTDS3Ref
diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
index 9c96d128006..a49442ec7a5 100644
--- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
+++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/PackageDescription.txt
@@ -1,6 +1,4 @@
-// Tetrahedral Remeshing
-
-/// \defgroup PkgTetrahedralRemeshingRef Tetrahedral Remeshing Reference
+/// \defgroup PkgTetrahedralRemeshingRef Reference Manual
 /// \defgroup PkgTetrahedralRemeshingConcepts Concepts
 /// \ingroup PkgTetrahedralRemeshingRef
 
diff --git a/Three/doc/Three/PackageDescription.txt b/Three/doc/Three/PackageDescription.txt
index 067d3fa3763..9d3211389fe 100644
--- a/Three/doc/Three/PackageDescription.txt
+++ b/Three/doc/Three/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgThreeRef Three Reference
+/// \defgroup PkgThreeRef Reference Manual
 ///
 /*!
 \addtogroup PkgThreeRef
diff --git a/Triangulation/doc/Triangulation/PackageDescription.txt b/Triangulation/doc/Triangulation/PackageDescription.txt
index 2ef98bf9d84..9816b3efa1e 100644
--- a/Triangulation/doc/Triangulation/PackageDescription.txt
+++ b/Triangulation/doc/Triangulation/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTriangulationsRef dD Triangulations Reference
+/// \defgroup PkgTriangulationsRef Reference Manual
 /// \defgroup PkgTriangulationsConcepts Concepts
 /// \ingroup PkgTriangulationsRef
 
diff --git a/Triangulation_2/doc/Triangulation_2/PackageDescription.txt b/Triangulation_2/doc/Triangulation_2/PackageDescription.txt
index 815186bb141..2800ac58008 100644
--- a/Triangulation_2/doc/Triangulation_2/PackageDescription.txt
+++ b/Triangulation_2/doc/Triangulation_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTriangulation2Ref 2D Triangulations Reference
+/// \defgroup PkgTriangulation2Ref Reference Manual
 /// \defgroup PkgTriangulation2Concepts Concepts
 /// \ingroup PkgTriangulation2Ref
 
diff --git a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
index df07b990016..d08497377f6 100644
--- a/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
+++ b/Triangulation_3/doc/Triangulation_3/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTriangulation3Ref 3D Triangulations Reference
+/// \defgroup PkgTriangulation3Ref Reference Manual
 /// \defgroup PkgTriangulation3Concepts Concepts
 /// \ingroup PkgTriangulation3Ref
 
diff --git a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt
index 5a59dd46ecc..5f3b585103b 100644
--- a/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt
+++ b/Triangulation_on_hyperbolic_surface_2/doc/Triangulation_on_hyperbolic_surface_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgHyperbolicSurfaceTriangulation2Ref 2D Triangulations on Hyperbolic Surfaces Reference
+/// \defgroup PkgHyperbolicSurfaceTriangulation2Ref Reference Manual
 
 /// \defgroup PkgHyperbolicSurfaceTriangulation2Concepts Concepts
 /// \ingroup PkgHyperbolicSurfaceTriangulation2Ref
diff --git a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/PackageDescription.txt b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/PackageDescription.txt
index 5fd9ff30df1..f48dc2f47ec 100644
--- a/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/PackageDescription.txt
+++ b/Triangulation_on_sphere_2/doc/Triangulation_on_sphere_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgTriangulationOnSphere2Ref 2D Triangulation on the Sphere Reference
+/// \defgroup PkgTriangulationOnSphere2Ref Reference Manual
 
 /// \defgroup PkgTriangulationOnSphere2Concepts Concepts
 /// \ingroup PkgTriangulationOnSphere2Ref
diff --git a/Visibility_2/doc/Visibility_2/PackageDescription.txt b/Visibility_2/doc/Visibility_2/PackageDescription.txt
index 4f1919adc56..7be9b8ab4cc 100644
--- a/Visibility_2/doc/Visibility_2/PackageDescription.txt
+++ b/Visibility_2/doc/Visibility_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgVisibility2Ref Visibility_2 Reference
+/// \defgroup PkgVisibility2Ref Reference Manual
 
 /// \defgroup PkgVisibility2Concepts Concepts
 /// \ingroup PkgVisibility2Ref
diff --git a/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt b/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt
index 898f2932d71..1bff5dc2d83 100644
--- a/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt
+++ b/Voronoi_diagram_2/doc/Voronoi_diagram_2/PackageDescription.txt
@@ -1,4 +1,4 @@
-/// \defgroup PkgVoronoiDiagram2Ref 2D Voronoi Diagram Adaptor Reference
+/// \defgroup PkgVoronoiDiagram2Ref Reference Manual
 /// \defgroup PkgVoronoiDiagram2Concepts Concepts
 /// \ingroup PkgVoronoiDiagram2Ref
 
diff --git a/Weights/doc/Weights/PackageDescription.txt b/Weights/doc/Weights/PackageDescription.txt
index 95c08a34bb7..d6e161d9163 100644
--- a/Weights/doc/Weights/PackageDescription.txt
+++ b/Weights/doc/Weights/PackageDescription.txt
@@ -2,7 +2,7 @@ namespace CGAL {
 namespace Weights {
 
 /*!
-\defgroup PkgWeightsRef Weight Interface Reference
+\defgroup PkgWeightsRef Reference Manual
 
 \defgroup PkgWeightsRefConcepts Concepts
 \ingroup PkgWeightsRef