diff --git a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
index 705c8971250..436ee703c7a 100644
--- a/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
@@ -521,7 +521,7 @@ flip_around(List_vertices& new_vertices)
 }
 
 
-#ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP
+#ifndef CGAL_CDT2_USE_RECURSIVE_PROPAGATING_FLIP
 template <class Gt, class Tds, class Itag >
 void
 Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>::
@@ -551,7 +551,7 @@ Constrained_Delaunay_triangulation_2<Gt,Tds,Itag>::
 propagating_flip(Face_handle f,int i, int depth)
 {
   if (!is_flipable(f,i)) return;
-#ifdef CGAL_DT2_IMMEDIATELY_NON_RECURSIVE_PROPAGATING_FLIP
+#ifdef CGAL_CDT2_IMMEDIATELY_NON_RECURSIVE_PROPAGATING_FLIP
   non_recursive_propagating_flip(f,i);
 #else
   int max_depth = 100;
diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
index 5ab02440175..0f0fc17c445 100644
--- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
@@ -175,7 +175,7 @@ public:
 #endif
 
 private:
-#ifndef CGAL_USE_DT2_RECURSIVE_PROPAGATING_FLIP
+#ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP
   void non_recursive_propagating_flip(Face_handle f,int i);
   void propagating_flip(const Face_handle& f,int i, int depth=0);
 #else
@@ -445,7 +445,7 @@ private:
 
 
 
-#ifdef CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS
+#ifdef CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
   template <class OutputItFaces, class OutputItBoundaryEdges> 
   std::pair<OutputItFaces,OutputItBoundaryEdges>
   propagate_conflicts (const Point  &p,
@@ -464,7 +464,7 @@ private:
     }
     return pit;
   }
-#else // NO CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS
+#else // NO CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
   template <class OutputItFaces, class OutputItBoundaryEdges> 
   std::pair<OutputItFaces,OutputItBoundaryEdges>
   non_recursive_propagate_conflicts ( const Point  &p,
@@ -515,7 +515,7 @@ private:
     }
     return pit;
   }
-#endif // NO CGAL_TRIANGULATION_2_USE_OLD_PROPAGATE_CONFLICTS
+#endif // NO CGAL_DT2_USE_RECURSIVE_PROPAGATE_CONFLICTS
 
 protected:
 
@@ -936,7 +936,7 @@ restore_Delaunay(Vertex_handle v)
   return;
 }
 
-#ifndef CGAL_USE_DT2_RECURSIVE_PROPAGATING_FLIP
+#ifndef CGAL_DT2_USE_RECURSIVE_PROPAGATING_FLIP
 template < class Gt, class Tds >
 void
 Delaunay_triangulation_2<Gt,Tds>::