diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
index c76784d0059a..1ebc78e8ce37 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ExplicitInteroperable.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsInteroperabilityConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalConcept
Two types `A` and `B` are a model of the `ExplicitInteroperable`
@@ -27,4 +27,3 @@ class ExplicitInteroperable {
public:
}; /* end ExplicitInteroperable */
-
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
index c250309555ca..0ba53cb6e022 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/Fraction.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsFractionsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalConcept
A type is considered as a `Fraction`, if there is a reasonable way to
@@ -17,4 +17,3 @@ class Fraction {
public:
}; /* end Fraction */
-
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
index 879d9b45ed38..6746fedcee23 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromDoubleConstructible.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalConcept
A model of the concept `FromDoubleConstructible` is required
@@ -27,4 +27,3 @@ FromDoubleConstructible(const double& d);
/// @}
}; /* end FromDoubleConstructible */
-
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
index 779b96188a71..dc23c29f649b 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/FromIntConstructible.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalConcept
A model of the concept `FromIntConstructible` is required
@@ -28,4 +28,3 @@ FromIntConstructible(int& i);
/// @}
}; /* end FromIntConstructible */
-
diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
index d7521aafcaab..a7c2f7389803 100644
--- a/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
+++ b/Algebraic_foundations/doc/Algebraic_foundations/Concepts/ImplicitInteroperable.h
@@ -1,6 +1,6 @@
/*!
-\ingroup PkgAlgebraicFoundationsInteroperabilityConcepts
+\ingroup PkgAlgebraicFoundationsAlgebraicStructuresConcepts
\cgalConcept
Two types `A` and `B` are a model of the concept
@@ -29,4 +29,3 @@ class ImplicitInteroperable {
public:
}; /* end ImplicitInteroperable */
-
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_2.h b/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_2.h
index 1c0cb7a99315..bd9fd496af3a 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_2.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_2.h
@@ -1,7 +1,6 @@
namespace CGAL {
/*!
-\ingroup kernel_affine
\ingroup kernel_classes2
The class `Aff_transformation_2` represents two-dimensional affine transformations.
diff --git a/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_3.h b/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_3.h
index 1312f02689f1..5616b1646cc1 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_3.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/Aff_transformation_3.h
@@ -2,7 +2,6 @@ namespace CGAL {
/*!
\ingroup kernel_classes3
-\ingroup kernel_affine
The class `Aff_transformation_3` represents three-dimensional affine transformations.
The general form of an affine transformation is based on a homogeneous
diff --git a/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h b/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
index 544592977145..493edd292749 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/aff_transformation_tags.h
@@ -2,7 +2,7 @@
namespace CGAL {
/*!
-\ingroup kernel_affine
+\ingroup PkgKernel23Ref
Tag class for affine transformations.
@@ -24,7 +24,7 @@ class Identity_transformation {
namespace CGAL {
/*!
-\ingroup kernel_affine
+\ingroup PkgKernel23Ref
Tag class for affine transformations.
@@ -46,7 +46,7 @@ class Reflection {
namespace CGAL {
/*!
-\ingroup kernel_affine
+\ingroup PkgKernel23Ref
Tag class for affine transformations.
@@ -68,7 +68,7 @@ class Rotation {
namespace CGAL {
/*!
-\ingroup kernel_affine
+\ingroup PkgKernel23Ref
Tag class for affine transformations.
@@ -90,7 +90,7 @@ class Scaling {
namespace CGAL {
/*!
-\ingroup kernel_affine
+\ingroup PkgKernel23Ref
Tag class for affine transformations.
diff --git a/Kernel_23/doc/Kernel_23/CGAL/intersections.h b/Kernel_23/doc/Kernel_23/CGAL/intersections.h
index 160bb35d7ebc..3670052bb6d5 100644
--- a/Kernel_23/doc/Kernel_23/CGAL/intersections.h
+++ b/Kernel_23/doc/Kernel_23/CGAL/intersections.h
@@ -12,7 +12,7 @@ function are available.
/*!
\addtogroup do_intersect_linear_grp
-\ingroup do_intersect
+\ingroup do_intersect_grp
\sa `do_intersect_circular_grp`
\sa `do_intersect_spherical_grp`
@@ -79,7 +79,7 @@ function are available.
/*!
\addtogroup intersection_linear_grp
-\ingroup intersection
+\ingroup intersection_grp
*/
/// @{
diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h b/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
index 58959c2fca5d..86488c197ce1 100644
--- a/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
+++ b/Minkowski_sum_2/doc/Minkowski_sum_2/CGAL/Polygon_convex_decomposition_2.h
@@ -31,7 +31,7 @@ class Greene_convex_decomposition_2 {
namespace CGAL {
/*!
-\ingroup PkgMinkowskiSum2Classes
+\ingroup PkgMinkowskiSum2Ref
The `Hertel_Mehlhorn_convex_decomposition_2` class implements the approximation algorithm of Hertel
and Mehlhorn for decomposing a polygon into convex
diff --git a/Polygonal_surface_reconstruction/include/CGAL/Polygonal_surface_reconstruction.h b/Polygonal_surface_reconstruction/include/CGAL/Polygonal_surface_reconstruction.h
index 9ca8016600b6..c4d22b473fbb 100644
--- a/Polygonal_surface_reconstruction/include/CGAL/Polygonal_surface_reconstruction.h
+++ b/Polygonal_surface_reconstruction/include/CGAL/Polygonal_surface_reconstruction.h
@@ -32,7 +32,7 @@
namespace CGAL {
/*!
- \ingroup PkgPolygonalSurfaceReconstruction
+ \ingroup PkgPolygonalSurfaceReconstructionRef
\brief
diff --git a/Solver_interface/include/CGAL/Eigen_sparse_matrix.h b/Solver_interface/include/CGAL/Eigen_sparse_matrix.h
index 2533f5fe8723..83622ad90581 100644
--- a/Solver_interface/include/CGAL/Eigen_sparse_matrix.h
+++ b/Solver_interface/include/CGAL/Eigen_sparse_matrix.h
@@ -298,7 +298,7 @@ struct Eigen_sparse_matrix
/*!
-\ingroup PkgSolverInterfaceRefLS
+\ingroup PkgSolverInterfaceLS
The class `Eigen_sparse_symmetric_matrix` is a wrapper around `Eigen` matrix type
`Eigen::SparseMatrix`
diff --git a/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h b/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
index fb2cea903d8c..09980d6e6dd0 100644
--- a/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
+++ b/Surface_mesh_parameterization/include/CGAL/surface_mesh_parameterization.h
@@ -11,7 +11,7 @@
// Author(s) : Mael Rouxel-Labbé
/**
-* \ingroup PkgSurfaceMeshParameterization
+* \ingroup PkgSurfaceMeshParameterizationRef
* \file CGAL/surface_mesh_parameterization.h
* Convenience header file including the headers for all
* the free functions of this package.
@@ -34,4 +34,3 @@
#include
#include
#include
-