diff --git a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h
index 8b9a2428400..10546777965 100644
--- a/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/demo/Voronoi_diagram_2/include/Virtual_Voronoi_diagram_2.h
@@ -244,7 +244,7 @@ class Virtual_Voronoi_diagram_base_2
 #endif
 
     if ( Face_handle* f = boost::get<Face_handle>(lrp) ) {
-      Ccb_halfedge_circulator ccb_start = (*f)->outer_ccb();
+      Ccb_halfedge_circulator ccb_start = (*f)->ccb();
       Ccb_halfedge_circulator ccb = ccb_start;
       do {
 	draw_edge(*ccb, widget);
diff --git a/Voronoi_diagram_2/examples/Voronoi_diagram_2/vd_2_point_location.cpp b/Voronoi_diagram_2/examples/Voronoi_diagram_2/vd_2_point_location.cpp
index 93029a7073a..8451c216bde 100644
--- a/Voronoi_diagram_2/examples/Voronoi_diagram_2/vd_2_point_location.cpp
+++ b/Voronoi_diagram_2/examples/Voronoi_diagram_2/vd_2_point_location.cpp
@@ -74,7 +74,7 @@ int main()
       std::cout << "face." << std::endl;
       std::cout << "The vertices of the Voronoi face are"
                 << " (in counterclockwise order):" << std::endl;
-      Ccb_halfedge_circulator ec_start = (*f)->outer_ccb();
+      Ccb_halfedge_circulator ec_start = (*f)->ccb();
       Ccb_halfedge_circulator ec = ec_start;
       do {
         print_endpoint(ec, false);
diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h
index 137de9ea371..62f21668d23 100644
--- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h
+++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Face.h
@@ -112,10 +112,11 @@ class Face
 		      );
   }
 
-  Ccb_halfedge_circulator outer_ccb() const {
+  Ccb_halfedge_circulator ccb() const {
     return Ccb_halfedge_circulator( *halfedge() );
   }
 
+  Ccb_halfedge_circulator outer_ccb() const { return ccb(); }
   // PREDICATES
   //-----------
   bool is_unbounded() const {
@@ -131,7 +132,7 @@ class Face
   }
 
   bool is_halfedge_on_ccb(const Halfedge_handle& he) const {
-    Ccb_halfedge_circulator hc_start = outer_ccb();
+    Ccb_halfedge_circulator hc_start = ccb();
     Ccb_halfedge_circulator hc = hc_start;
     do {
       if ( he == *hc ) { return true; }
@@ -155,7 +156,7 @@ class Face
 
     valid = valid && !vda_->edge_rejector()(vda_->dual(), halfedge()->dual());
 
-    Ccb_halfedge_circulator hc = outer_ccb();
+    Ccb_halfedge_circulator hc = ccb();
     Ccb_halfedge_circulator hc_start = hc;
     Face_handle f_this(*this);
     do {
diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h
index 8ac77b36b5f..42c728569eb 100644
--- a/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h
+++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/include/vda_test_vda.h
@@ -53,7 +53,7 @@ void test_vd_face_concept(const typename VDA::Face_handle& f, int dim)
     Halfedge_handle e = f->halfedge();
     CGAL_assertion( e->face() == f );
 
-    CCBHC hc_start = f->outer_ccb();
+    CCBHC hc_start = f->ccb();
     CCBHC hc = hc_start;
     test_circulator(hc);