diff --git a/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h b/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h
index b2a37c88fe4..e0257953b77 100644
--- a/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h
+++ b/AABB_tree/doc/AABB_tree/Concepts/AABBTraits.h
@@ -58,13 +58,14 @@ typedef std::pair<Point_3, Primitive::Id> Point_and_primitive_id;
 typedef std::pair<Object, Primitive::Id> Object_and_primitive_id;
 
 
-/*!  A nested class template providing as a pair the intersection result of a `Query` object
+/*!
+A nested class template providing as a pair the intersection result of a `Query` object
 and a `Primitive::Datum`, together with the `Primitive::Id` of the primitive intersected.
-The type of the pair is given by the nested type `Type`.
+The type of the pair is  `%Intersection_and_primitive_id<Query>::%Type`.
 */
 
-  template <typename Query>
-  struct Intersection_and_primitive_id{};
+template <typename Query>
+using Intersection_and_primitive_id = unspecified_type;
 
 /// @}
 
diff --git a/AABB_tree/include/CGAL/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h
index 037471f84b4..6c0d95020cc 100644
--- a/AABB_tree/include/CGAL/AABB_tree.h
+++ b/AABB_tree/include/CGAL/AABB_tree.h
@@ -91,12 +91,17 @@ namespace CGAL {
 		typedef typename AABBTraits::Object_and_primitive_id Object_and_primitive_id;
 
     /*!
-    An alias to AABBTraits::Interesction_and_primitive_id
+    An alias to `AABBTraits::Intersection_and_primitive_id<Query>`
     */
+    #ifdef DOXYGEN_RUNNING
+    template<typename Query>
+    using Intersection_and_primitive_id = AABBTraits::Intersection_and_primitive_id<Query>;
+    #else
     template<typename Query>
     struct Intersection_and_primitive_id {
       typedef typename AABBTraits::template Intersection_and_primitive_id<Query>::Type Type;
     };
+    #endif
 
     
     ///@}