diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h
index a040a8a577c..210a9f8b5be 100644
--- a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h
+++ b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSFaceBase_2.h
@@ -46,16 +46,16 @@ that the `Triangulation_data_structure_2`
 actually uses as a base class for the class 
 `Triangulation_data_structure_2::Face`. 
 
-\hasModel CGAL::Triangulation_ds_face_base_2<Tds> 
-\hasModel CGAL::Triangulation_face_base_2<Traits,Fb> 
-\hasModel CGAL::Regular_triangulation_face_base_2<Traits,Fb> 
-\hasModel CGAL::Constrained_triangulation_face_base_2<Traits,Fb> 
-\hasModel CGAL::Triangulation_face_base_with_info_2<Info,Traits,Fb> 
+\hasModel `CGAL::Triangulation_ds_face_base_2<Tds>`
+\hasModel `CGAL::Triangulation_face_base_2<Traits,Fb>` 
+\hasModel `CGAL::Regular_triangulation_face_base_2<Traits,Fb>` 
+\hasModel `CGAL::Constrained_triangulation_face_base_2<Traits,Fb>` 
+\hasModel `CGAL::Triangulation_face_base_with_info_2<Info,Traits,Fb>` 
 
 \sa `TriangulationDSVertexBase_2` 
 \sa `TriangulationDataStructure_2::Face` 
 \sa `TriangulationFaceBase_2` 
-\sa `Triangulation_data_structure_2<Vb,Fb>` 
+\sa `CGAL::Triangulation_data_structure_2<Vb,Fb>` 
 
 */
 
diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h
index 57ecef405db..402f2043491 100644
--- a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h
+++ b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDSVertexBase_2.h
@@ -44,17 +44,17 @@ of `Triangulation_data_structure_2::Vertex`.
 
 \refines ::TriangulationDataStructure_2::Vertex 
 
-\hasModel CGAL::Triangulation_ds_vertex_base_2<Tds> 
-\hasModel CGAL::Triangulation_vertex_base_2<Traits,Vb> 
-\hasModel CGAL::Regular_triangulation_vertex_base_2<Traits,Vb> 
-\hasModel CGAL::Triangulation_hierarchy_vertex_base_2<Vb> 
-\hasModel CGAL::Triangulation_vertex_base_with_info_2<Info,Traits,vb> 
+\hasModel `CGAL::Triangulation_ds_vertex_base_2<Tds>`
+\hasModel `CGAL::Triangulation_vertex_base_2<Traits,Vb>`
+\hasModel `CGAL::Regular_triangulation_vertex_base_2<Traits,Vb>`
+\hasModel `CGAL::Triangulation_hierarchy_vertex_base_2<Vb>`
+\hasModel `CGAL::Triangulation_vertex_base_with_info_2<Info,Traits,Vb>`
 
 \sa `TriangulationVertexBase_2` 
 \sa `TriangulationDSFaceBase_2` 
 \sa `TriangulationFaceBase_2` 
 \sa `TriangulationDataStructure_2::Vertex` 
-\sa `Triangulation_data_structure_2<Vb,Fb>` 
+\sa `CGAL::Triangulation_data_structure_2<Vb,Fb>` 
 
 */
 
diff --git a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h
index ba0021dfa6f..a8a6d5125b2 100644
--- a/Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h
+++ b/Triangulation_2/doc/TDS_2/Concepts/TriangulationDataStructure_2.h
@@ -65,7 +65,7 @@ the rank of this item in the output order.
 When dimension \f$ <\f$ 2, the same information is output 
 for faces of maximal dimension instead of faces. 
 
-\hasModel CGAL::Triangulation_data_structure_2<Vb,Fb> 
+\hasModel `CGAL::Triangulation_data_structure_2<Vb,Fb>` 
 
 \sa `TriangulationDataStructure_2::Face` 
 \sa `TriangulationDataStructure_2::Vertex` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h
index f6b58b905fd..f5b45e4e942 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedDelaunayTriangulationTraits_2.h
@@ -20,14 +20,14 @@ The concept `ConstrainedDelaunayTriangulationTraits_2` refines both the concept
 \refines ::ConstrainedTriangulationTraits_2 
 
 \hasModel All \cgal Kernels
-\hasModel Triangulation_euclidean_traits_xy<K> 
-\hasModel Triangulation_euclidean_traits_yz<K> 
-\hasModel Triangulation_euclidean_traits_xz<K> 
+\hasModel `CGAL::Triangulation_euclidean_traits_xy<K>` 
+\hasModel `CGAL::Triangulation_euclidean_traits_yz<K>` 
+\hasModel `CGAL::Triangulation_euclidean_traits_xz<K>` 
 
 \sa `TriangulationTraits_2` 
 \sa `ConstrainedTriangulationTraits_2` 
-\sa `Constrained_triangulation_2<Gt,Tds,Itag>` 
-\sa `Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>` 
+\sa `CGAL::Constrained_triangulation_2<Gt,Tds,Itag>` 
+\sa `CGAL::Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>` 
 
 */
 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h
index e9eb3d59a37..7f2e90805dc 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationFaceBase_2.h
@@ -20,7 +20,7 @@ Types
 
 Defines the same types as the `TriangulationFaceBase_2` concept 
 
-\hasModel CGAL::Constrained_triangulation_face_base_2<Traits> 
+\hasModel `CGAL::Constrained_triangulation_face_base_2<Traits>` 
 
 \sa `TriangulationFaceBase_2` 
 \sa `CGAL::Constrained_triangulation_2<Traits,Tds>` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h
index 2b9652c6d89..1430be66aea 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/ConstrainedTriangulationTraits_2.h
@@ -20,9 +20,9 @@ to compute the squared distance between a point and a line
 \refines ::TriangulationTraits_2 
 
 \hasModel All \cgal Kernels
-\hasModel CGAL::Projection_traits_xy_3<K> 
-\hasModel CGAL::Projection_traits_yz_3<K> 
-\hasModel CGAL::Projection_traits_zx_3<K> 
+\hasModel `CGAL::Projection_traits_xy_3<K>` 
+\hasModel `CGAL::Projection_traits_yz_3<K>` 
+\hasModel `CGAL::Projection_traits_zx_3<K>` 
 
 \sa `TriangulationTraits_2` 
 \sa `ConstrainedDelaunayTriangulationTraits_2` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h
index d19954aaeb2..c20cdf928bf 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/DelaunayTriangulationTraits_2.h
@@ -27,9 +27,9 @@ required if calls to
 
 The following traits classes provide everything except types and member 
 functions required for the dual Voronoi diagram: 
-\hasModel CGAL::Projection_traits_xy_3<K> 
-\hasModel CGAL::Projection_traits_yz_3<K> 
-\hasModel CGAL::Projection_traits_zx_3<K> 
+\hasModel `CGAL::Projection_traits_xy_3<K>` 
+\hasModel `CGAL::Projection_traits_yz_3<K>` 
+\hasModel `CGAL::Projection_traits_zx_3<K>` 
 
 \sa `TriangulationTraits_2` 
 */
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h
index ff2e0f86810..fcbde1eb245 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationFaceBase_2.h
@@ -34,7 +34,7 @@ in the face a list to store hidden vertices.
 
 \refines ::TriangulationFaceBase_2 
 
-\hasModel CGAL::Regular_triangulation_face_base_2 
+\hasModel `CGAL::Regular_triangulation_face_base_2` 
 
 \sa `TriangulationFaceBase_2` 
 \sa `RegularTriangulationVertexBase_2` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h
index c0517e3cb08..2f213b471de 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationTraits_2.h
@@ -19,8 +19,8 @@ of Delaunay triangulations.
 
 \refines ::TriangulationTraits_2 
 
-\hasModel CGAL::Regular_triangulation_traits_2<Rep> 
-\hasModel CGAL::Regular_triangulation_filtered_traits_2<FK> 
+\hasModel `CGAL::Regular_triangulation_traits_2<Rep>` 
+\hasModel `CGAL::Regular_triangulation_filtered_traits_2<FK>` 
 
 \sa `TriangulationTraits_2` 
 \sa `CGAL::Regular_triangulation_2<Traits,Tds>` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h
index 9aa4f4bbd69..829ecb36ed5 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/RegularTriangulationVertexBase_2.h
@@ -35,7 +35,7 @@ vertex of the triangulation or a hidden vertex.
 
 \refines ::TriangulationVertexBase_2 
 
-\hasModel CGAL::Regular_triangulation_vertex_base_2 
+\hasModel `CGAL::Regular_triangulation_vertex_base_2` 
 
 \sa `TriangulationVertexBase_2` 
 \sa `CGAL::Regular_triangulation_vertex_base_2` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h
index 7bc4f6d74a4..e0127b241a7 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationFaceBase_2.h
@@ -17,7 +17,7 @@ and only provided for symmetry with the vertex case.
 
 \refines ::TriangulationDSFaceBase_2 
 
-\hasModel CGAL::Triangulation_face_base_2<Traits> 
+\hasModel `CGAL::Triangulation_face_base_2<Traits>` 
 
 \sa `TriangulationVertexBase_2` 
 \sa `CGAL::Triangulation_face_base_2<Traits>` 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h
index c0af490555f..5fd22be340e 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationHierarchyVertexBase_2.h
@@ -14,9 +14,9 @@ next and previous level triangulations.
 
 \refines ::TriangulationVertexBase_2 
 
-\hasModel CGAL::Triangulation_hierarchy_vertex_base_2<Vb> 
+\hasModel `CGAL::Triangulation_hierarchy_vertex_base_2<Vb>` 
 
-\sa `Triangulation_hierarchy_2<Tr>` 
+\sa `CGAL::Triangulation_hierarchy_2<Tr>` 
 
 */
 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h
index ab2acb0e85b..94b15cbec28 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationTraits_2.h
@@ -11,10 +11,10 @@ triangulation and some function object types for the required
 predicates on those primitives.
 
 \hasModel All the \cgal Kernels 
-\hasModel CGAL::Triangulation_euclidean_traits_2<K> 
-\hasModel CGAL::Projection_traits_xy_3<K> 
-\hasModel CGAL::Projection_traits_yz_3<K> 
-\hasModel CGAL::Projection_traits_zx_3<K> 
+\hasModel `CGAL::Triangulation_euclidean_traits_2<K>`
+\hasModel `CGAL::Projection_traits_xy_3<K>`
+\hasModel `CGAL::Projection_traits_yz_3<K>`
+\hasModel `CGAL::Projection_traits_zx_3<K>`
 
 \sa `CGAL::Triangulation_2<Traits,Tds>` 
 
diff --git a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h
index 3a717477e88..d56d6ea4724 100644
--- a/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h
+++ b/Triangulation_2/doc/Triangulation_2/Concepts/TriangulationVertexBaseWithInfo_2.h
@@ -8,7 +8,7 @@ and provides an additional information storage.
 
 \refines ::TriangulationVertexBase_2 
 
-\hasModel CGAL::Triangulation_vertex_base_with_info_2 
+\hasModel `CGAL::Triangulation_vertex_base_with_info_2`
 
 */