diff --git a/Packages/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h b/Packages/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h
index 6e4e4547543..5579827b02c 100644
--- a/Packages/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h
+++ b/Packages/Apollonius_graph_2/demo/Apollonius_graph_2/typedefs.h
@@ -63,7 +63,7 @@ CGAL::Apollonius_graph_euclidean_traits_2<Rep,CGAL::Ring_tag>  Gt;
 
 typedef Gt::Point_2                           Point_2;
 typedef Rep::Circle_2                         Circle_2;
-typedef Gt::Apollonius_site_2                 Apollonius_site_2;
+typedef Gt::Site_2                            Apollonius_site_2;
 typedef Gt::Kernel::RT                        Weight;
 
 //typedef CGAL::Apollonius_graph_2<Gt> AG_2;
diff --git a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example1.C b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example1.C
index de5c6794be2..6800b11da18 100644
--- a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example1.C
+++ b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example1.C
@@ -42,7 +42,7 @@ int main()
   assert( ifs );
 
   Apollonius_graph ag;
-  Apollonius_graph::Apollonius_site_2 site;
+  Apollonius_graph::Site_2 site;
 
   // read the weighted points and insert them in the Apollonius graph
   while ( ifs >> site ) {
diff --git a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example2.C b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example2.C
index 9be5122189d..6d36f52ae6e 100644
--- a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example2.C
+++ b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example2.C
@@ -80,7 +80,7 @@ int main()
   assert( ifs );
 
   Apollonius_graph ag;
-  Apollonius_graph::Apollonius_site_2 site;
+  Apollonius_graph::Site_2 site;
 
   // read the weighted points and insert them in the Apollonius graph
   while ( ifs >> site ) {
diff --git a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example3.C b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example3.C
index 60b04d2fa09..ed505c8dc5e 100644
--- a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example3.C
+++ b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example3.C
@@ -26,15 +26,22 @@ typedef CGAL::Filtered_kernel<CK>  Kernel;
 // typedefs for the traits and the algorithm
 
 #include <CGAL/Apollonius_graph_2.h>
+#include <CGAL/Apollonius_graph_data_structure_2.h>
+#include <CGAL/Apollonius_graph_vertex_base_2.h>
+#include <CGAL/Apollonius_graph_face_base_2.h>
 #include <CGAL/Apollonius_graph_euclidean_traits_2.h>
 
 typedef CGAL::Apollonius_graph_euclidean_traits_2<Kernel> Traits;
 
-// with the second template argument being false, we indicate that
-// there is no need to store that hidden weighted points;
+// with the second template argument in the vertex base class being
+// false, we indicate that there is no need to store that hidden
+// weighted points;
 // one case where this is indeed not needed is when we only do
 // insertions, like in the main program below.
-typedef CGAL::Apollonius_graph_2<Traits,false> Apollonius_graph;
+typedef CGAL::Apollonius_graph_vertex_base_2<Traits,false>   Vb;
+typedef CGAL::Apollonius_graph_face_base_2<Traits>           Fb;
+typedef CGAL::Apollonius_graph_data_structure_2<Vb,Fb>       Agds;
+typedef CGAL::Apollonius_graph_2<Traits,Agds>         Apollonius_graph;
 
 
 
@@ -44,7 +51,7 @@ int main()
   assert( ifs );
 
   Apollonius_graph ag;
-  Apollonius_graph::Apollonius_site_2 site;
+  Apollonius_graph::Site_2 site;
 
   // read the weighted points and insert them in the Apollonius graph
   while ( ifs >> site ) {
diff --git a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example4.C b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example4.C
index 5ece2867974..45366ddfc29 100644
--- a/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example4.C
+++ b/Packages/Apollonius_graph_2/examples/Apollonius_graph_2/example4.C
@@ -45,7 +45,7 @@ int main()
   assert( ifs );
 
   Apollonius_graph ag;
-  Apollonius_graph::Apollonius_site_2 site;
+  Apollonius_graph::Site_2 site;
 
   // read the weighted points and insert them in the Apollonius graph
   while ( ifs >> site ) {
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
index e10fb184b68..8423fa88b12 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
@@ -43,7 +43,7 @@
 
 #include <CGAL/Iterator_project.h>
 #include <CGAL/Nested_iterator.h>
-#include <CGAL/Combined_iterator.h>
+#include <CGAL/Concatenate_iterator.h>
 
 
 CGAL_BEGIN_NAMESPACE
@@ -117,8 +117,8 @@ public:
 			  Hidden_sites_nested_iterator_traits>
   /*                                          */ Hidden_sites_iterator;
 
-  typedef Combined_iterator<Visible_sites_iterator,
-			    Hidden_sites_iterator>      Sites_iterator;
+  typedef Concatenate_iterator<Visible_sites_iterator,
+			       Hidden_sites_iterator>   Sites_iterator;
 
   typedef Site_2               value_type; // to have a back_inserter
   typedef const value_type&    const_reference;