diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
index ff97c34c384..f91e2d46607 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt
@@ -3487,11 +3487,11 @@ where the `GeomTraits` parameter is substituted by a model of the
 concept `AosLandmarkTraits_2`. (Naturally, it can also model
 either the `AosXMonotoneTraits_2` concept or the
 `AosTraits_2` concept.) The `AosLandmarkTraits_2`
-concept refines the two concepts `AosApproximateTraits_2` and
+concept refines the two concepts `AosApproximatePointTraits_2` and
 `AosConstructXMonotoneCurveTraits_2`. Each of these two
 concepts, in turn, refines the concept `AosBasicTraits_2`.
 
-A model of the `AosApproximateTraits_2` concept must define a
+A model of the `AosApproximatePointTraits_2` concept must define a
 fixed precision number type (typically the double-precision
 floating-point `double`) and support the operation below (in addition
 to fulfilling the requirements listed by the `AosBasicTraits_2`
@@ -3499,7 +3499,7 @@ concept).
 
 <DL>
 
-<DT>\link AosApproximateTraits_2::Approximate_2 <B>`Approximate_2`</B>\endlink:
+<DT>\link AosApproximatePointTraits_2::Approximate_2 <B>`Approximate_2`</B>\endlink:
 <DD> Given a point `p`, approximate the \f$x\f$ and
 \f$y\f$-coordinates of `p` using a not necessarily multi-precision
 number type. We use this operation for approximate
@@ -4251,10 +4251,10 @@ a geometry-traits class that models the same four concepts.  We refer
 to the type that substitutes the template parameter `SubcurveTraits_2`
 as the <em>subcurve traits</em> hereafter.  If, in addition, the
 subcurve traits also models the concept
-`AosApproximateTraits_2` then the instantiated
+`AosApproximatePointTraits_2` then the instantiated
 `Arr_polyline_traits_2<SubcurveTraits>` type models the concept
-`AosApproximateTraits_2` as well. (By definition, modeling the
-concepts `AosApproximateTraits_2` and
+`AosApproximatePointTraits_2` as well. (By definition, modeling the
+concepts `AosApproximatePointTraits_2` and
 `AosConstructXMonotoneCurveTraits_2` implies modeling the
 concept `AosLandmarkTraits_2`.) Similarly, if the subcurve
 traits also models the concept `AosOpenBoundaryTraits_2` then
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
index 1068f58dd7d..2a1fad853ae 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polycurve_traits_2.h
@@ -28,7 +28,7 @@ namespace CGAL {
  *   - `AosDirectionalXMonotoneTraits_2`.
  *
  * If, in addition, the SubcurveTraits_2 models the concept
- * `AosApproximateTraits_2` then `Arr_polycurve_traits_2` models this
+ * `AosApproximatePointTraits_2` then `Arr_polycurve_traits_2` models this
  * concept as well. The same holds for the concept
  * `AosOpenBoundaryTraits_2`. If no type is provided, then
  * `Arr_segment_traits_2` (instantiated with
@@ -74,7 +74,7 @@ namespace CGAL {
  * included.
  *
  * \cgalModels{AosTraits_2,AosDirectionalXMonotoneTraits_2,
- *             AosApproximateTraits_2 (if the type that substitutes
+ *             AosApproximatePointTraits_2 (if the type that substitutes
  *   the template parameter `SubcurveTraits_2` models the concept as well)}
  *
  * \sa `Arr_algebraic_segment_traits_2<Coefficient>`
@@ -286,13 +286,11 @@ public:
     /// \name Types
     /// @{
 
-    /*! The container of the subcurves that comprises the polycurve.
-     */
+    /// The container of the subcurves that comprises the polycurve.
     typedef typename std::vector<Subcurve_2>        Subcurves_container;
 
   public:
-    /*! The size of the container that comprises the polycurve.
-     */
+    /// The size of the container that comprises the polycurve.
     typedef typename Subcurves_container::size_type Size;
     typedef typename Subcurves_container::size_type size_type;
 
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
index ea9dff66c90..31599102e75 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_polyline_traits_2.h
@@ -36,7 +36,7 @@ namespace CGAL {
  *   - `AosConstructCurveTraits_2`.
  *
  * If, in addition, the GeometryTraits_2 models the concept
- * `AosApproximateTraits_2` then `Arr_polycurve_traits_2` models
+ * `AosApproximatePointTraits_2` then `Arr_polycurve_traits_2` models
  * this concept as well. The same holds for the concept
  * `AosOpenBoundaryTraits_2`. If no type is provided, then
  * `Arr_segment_traits_2` (instantiated with
@@ -77,8 +77,9 @@ namespace CGAL {
  * the macro `CGAL_ALWAYS_LEFT_TO_RIGHT` to 1 before any \cgal header is
  * included.
  *
- * \cgalModels{AosTraits_2,AosDirectionalXMonotoneTraits_2,AosConstructXMonotoneCurveTraits_2,AosConstructCurveTraits_2,AosApproximateTraits_2 (if the type that substitutes
- *   the template parameter `SegmentTraits_2` models the concept as well)}
+ * \cgalModels{AosTraits_2,AosDirectionalXMonotoneTraits_2,AosConstructXMonotoneCurveTraits_2,AosConstructCurveTraits_2,AosApproximatePointTraits_2
+ * (if the type that substitutes the template parameter `SegmentTraits_2`
+ * models the concept as well)}
  *
  * \sa `Arr_polycurve_traits_2<SubcurveTraits_2>`
  * \sa `Arr_Bezier_curve_traits_2<RatKernel, AlgKernel, NtTraits>`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximateTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximatePointTraits_2.h
similarity index 91%
rename from Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximateTraits_2.h
rename to Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximatePointTraits_2.h
index 87b94427249..2c00cd3004c 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximateTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosApproximatePointTraits_2.h
@@ -1,7 +1,7 @@
 /*! \ingroup PkgArrangementOnSurface2ConceptsTraits
  * \cgalConcept
  *
- * The concept `AosApproximateTraits_2` refines the basic traits concept
+ * The concept `AosApproximatePointTraits_2` refines the basic traits concept
  * `AosBasicTraits_2`. A model of this concept is able to approximate a point.
  *
  * \cgalRefines{AosBasicTraits_2}
@@ -21,7 +21,7 @@
  * \sa `AosXMonotoneTraits_2`
  * \sa `AosTraits_2`
  */
-class AosApproximateTraits_2 {
+class AosApproximatePointTraits_2 {
 public:
   /// \name Types
   /// @{
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosConstructXMonotoneCurveTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosConstructXMonotoneCurveTraits_2.h
index 9530063050c..66261e41f76 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosConstructXMonotoneCurveTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosConstructXMonotoneCurveTraits_2.h
@@ -17,7 +17,7 @@
  * \cgalHasModels{CGAL::Arr_rational_function_traits_2<AlgebraicKernel_d_1>}
  * \cgalHasModelsEnd
  *
- * \sa `AosApproximateTraits_2`
+ * \sa `AosApproximatePointTraits_2`
  * \sa `AosXMonotoneTraits_2`
  * \sa `AosTraits_2`
  * \sa `AosConstructCurveTraits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosLandmarkTraits_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosLandmarkTraits_2.h
index daf4f0ff873..a397e520631 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosLandmarkTraits_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosLandmarkTraits_2.h
@@ -2,14 +2,14 @@
  * \cgalConcept
  *
  * The concept `AosLandmarkTraits_2` refines the traits concepts
- * `AosApproximateTraits_2` and
+ * `AosApproximatePointTraits_2` and
  * `AosConstructXMonotoneCurveTraits_2`. The type of an arrangement
  * associated with the landmark point-location strategy (see
  * `CGAL::Arr_landmarks_point_location`) must be an instance of the
  * `CGAL::Arrangement_2<Traits,Dcel>` class template, where the Traits parameter
  * is substituted by a model of this concept.
  *
- * \cgalRefines{AosApproximateTraits_2,AosConstructXMonotoneCurveTraits_2}
+ * \cgalRefines{AosApproximatePointTraits_2,AosConstructXMonotoneCurveTraits_2}
  *
  * \cgalHasModelsBegin
  * \cgalHasModels{CGAL::Arr_conic_traits_2<RatKernel,AlgKernel,NtTraits>}
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosTraits--Approximate_2.h b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosTraits--Approximate_2.h
index 46becfd597e..be9fe4443e0 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosTraits--Approximate_2.h
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/AosTraits--Approximate_2.h
@@ -6,7 +6,7 @@ namespace AosTraits {
  * \cgalRefines{Functor}
  *
  * \cgalHasModelsBegin
- * \cgalHasModels{AosApproximateTraits_2::Approximate_2}
+ * \cgalHasModels{AosApproximatePointTraits_2::Approximate_2}
  * \cgalHasModelsEnd
  */
 class Approximate_2 {
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 2b9606a9977..774d15e834a 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
@@ -112,7 +112,7 @@ implemented as peripheral classes or as free (global) functions.
 
 \cgalCRPSection{Concepts}
 
-- `AosApproximateTraits_2`
+- `AosApproximatePointTraits_2`
 - `AosBasicTopologyTraits`
 - `AosBasicTraits_2`
 - `AosBottomSideTraits_2`
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/landmark_concept_cluster.tex b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/landmark_concept_cluster.tex
index f85659c3a0a..eeb9e0e589e 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/landmark_concept_cluster.tex
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/fig_src/landmark_concept_cluster.tex
@@ -11,7 +11,7 @@
   [\name{AosBasicTraits\_2},name=abt,
     % forked edges,
     for tree={concept,edge={-latex}}
-    [\name{AosApproximateTraits\_2}
+    [\name{AosApproximatePointTraits\_2}
       [,phantom]
       [\name{AosLandmarkTraits\_2},name=alt,before drawing tree={x=0}]
     ]