diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_2.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_2.h
index da3ebb8e99b..d4670be5862 100644
--- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_2.h
+++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_2.h
@@ -56,7 +56,7 @@ public:
   Construct_cartesian_const_iterator_2 construct_cartesian_const_iterator_2_object();
 
   /*!
-    A functor object to construct a vector giving the direction of a ray. Provides the operator:
+    A functor object to construct a vector having the direction as a ray. Provides the operator:
     `Vector_2 operator()(const Ray_2&);`
    */
   typedef unspecified_type Construct_vector_2;
diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_3.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_3.h
index a217a0e148d..5a762a4a376 100644
--- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_3.h
+++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionGeomTraits_3.h
@@ -4,10 +4,10 @@
 
 The concept `AABBRayIntersectionGeomTraits_3` is a refinement of the
 concept `AABBGeomTraits_3`. In addition to the types required by
-`AABBGeomTraits` it also requires types and functors necessary to
+`AABBGeomTraits_3` it also requires types and functors necessary to
 define the Intersection_distance functor.
 
-\cgalRefines{AABBGeomTraits}
+\cgalRefines{AABBGeomTraits_3}
 
 \cgalHasModelsBegin
 \cgalHasModelsBare{All models of the concept `Kernel`}
@@ -46,21 +46,21 @@ public:
   typedef unspecified_type Cartesian_const_iterator_3;
 
   /*!
-    A model of `ConstructCartesianConstIterator3`.
+    A model of `ConstructCartesianConstIterator_33`.
    */
   typedef unspecified_type  Construct_cartesian_const_iterator_3;
 
   /*!
    */
-  Construct_source_3 construct_cartesian_const_iterator_3_object();
+  Construct_cartesian_const_iterator_3 construct_cartesian_const_iterator_3_object();
 
   /*!
-    A functor object to construct a vector giving the direction of a ray. Provides the operator:
+    A functor object to construct a vector having the same direction as a ray. Provides the operator:
     `Vector_3 operator()(const Ray_3&);`
    */
   typedef unspecified_type Construct_vector_3;
 
   /*!
    */
-  Construct_source_3 construct_vector_3_object();
+  Construct_vector_3 construct_vector_3_object();
 };
diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h
index 7f02a72d8e9..bad402323b2 100644
--- a/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h
+++ b/AABB_tree/doc/AABB_tree/Concepts/AABBRayIntersectionTraits.h
@@ -7,6 +7,8 @@ The concept `AABBRayIntersectionTraits` is a refinement of the concept
 `AABBTraits` it also requires function objects to calculate the
 distance of an intersection along a ray.
 
+\cgalRefines{AABBTraits}
+
 \cgalHasModelsBegin
 \cgalHasModels{CGAL::AABB_traits_2<AABBGeomTraits_2,AABBPrimitive>}
 \cgalHasModels{CGAL::AABB_traits_3<AABBGeomTraits_3,AABBPrimitive>}
@@ -50,7 +52,7 @@ public:
 
   /*!
    */
-  Construct_source construct_cartesian_const_iterator_object();
+  Construct_cartesian_const_iterator construct_cartesian_const_iterator_object();
 
   /*!
     A functor object to construct a vector having the same direction as a ray. Provides the operator:
@@ -60,7 +62,7 @@ public:
 
   /*!
    */
-  Construct_source construct_vector_object();
+  Construct_vector construct_vector_object();
 
 
   /*!
diff --git a/AABB_tree/doc/AABB_tree/PackageDescription.txt b/AABB_tree/doc/AABB_tree/PackageDescription.txt
index c71a506292b..4aea07e8e6a 100644
--- a/AABB_tree/doc/AABB_tree/PackageDescription.txt
+++ b/AABB_tree/doc/AABB_tree/PackageDescription.txt
@@ -5,7 +5,7 @@
 
 /*!
 \addtogroup PkgAABBTreeRef
-\cgalPkgDescriptionBegin{Fast Intersection and Distance Computation,PkgAABBTree}
+\cgalPkgDescriptionBegin{2D and 3D Fast Intersection and Distance Computation,PkgAABBTree}
 \cgalPkgPicture{aabb-teaser-thumb.png}
 \cgalPkgSummaryBegin
 \cgalPkgAuthors{Pierre Alliez, Stéphane Tayeb, and Camille Wormser}
diff --git a/AABB_tree/include/CGAL/AABB_tree/internal/AABB_traits_base.h b/AABB_tree/include/CGAL/AABB_tree/internal/AABB_traits_base.h
index 4011d2c57d3..3fc4968c3c6 100644
--- a/AABB_tree/include/CGAL/AABB_tree/internal/AABB_traits_base.h
+++ b/AABB_tree/include/CGAL/AABB_tree/internal/AABB_traits_base.h
@@ -44,4 +44,4 @@ struct AABB_traits_base<Primitive, true> {
 }
 }
 
-#endif
\ No newline at end of file
+#endif