diff --git a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h
index b70e0e04856..94d2ca179fa 100644
--- a/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h
+++ b/Circular_kernel_2/include/CGAL/Circular_arc_point_2.h
@@ -73,19 +73,19 @@ public:
   {}
       
   typename Qualified_result_of
-  <typename R::Compute_Circular_x_2,Circular_arc_point_2>::type
+  <typename R::Compute_circular_x_2,Circular_arc_point_2>::type
   //const Root_of_2 &
   x() const
   { 
-    return typename R::Compute_Circular_x_2()(*this); 
+    return typename R::Compute_circular_x_2()(*this); 
   }
 
   typename Qualified_result_of
-  <typename R::Compute_Circular_y_2,Circular_arc_point_2>::type
+  <typename R::Compute_circular_y_2,Circular_arc_point_2>::type
   //const Root_of_2 &
   y() const
   { 
-    return typename R::Compute_Circular_y_2()(*this); 
+    return typename R::Compute_circular_y_2()(*this); 
   }
 
   Bbox_2  bbox() const
@@ -184,11 +184,11 @@ public:
   const Rcircular_arc_point_2& point() const
   {return P_point;}
             
-  typename Qualified_result_of<typename R::Compute_Circular_x_2,Rcircular_arc_point_2>::type
+  typename Qualified_result_of<typename R::Compute_circular_x_2,Rcircular_arc_point_2>::type
   x() const
     { return P_point.x();}
 
-  typename Qualified_result_of<typename R::Compute_Circular_y_2,Rcircular_arc_point_2>::type
+  typename Qualified_result_of<typename R::Compute_circular_y_2,Rcircular_arc_point_2>::type
   y() const
     { return P_point.y();}
 
diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
index d1ca196c279..b018acef8a1 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/function_objects_polynomial_circular.h
@@ -864,7 +864,7 @@ template < class CK >
 
 
   template <class CK>
-  class Compute_Circular_x_2: Has_qrt
+  class Compute_circular_x_2: Has_qrt
   {
     typedef typename CK::Circular_arc_point_2   Circular_arc_point_2;
     typedef typename CK::Root_of_2                 Root_of_2;
@@ -882,8 +882,8 @@ template < class CK >
 
 
   template <class CK>
-  class Compute_Circular_y_2: Has_qrt
-  {
+  class Compute_circular_y_2: Has_qrt
+	{
     typedef typename CK::Circular_arc_point_2   Circular_arc_point_2;
     typedef typename CK::Root_of_2                 Root_of_2;
 
diff --git a/Circular_kernel_2/include/CGAL/Circular_kernel_2/interface_macros.h b/Circular_kernel_2/include/CGAL/Circular_kernel_2/interface_macros.h
index 5c83ac1c931..96136281a2f 100644
--- a/Circular_kernel_2/include/CGAL/Circular_kernel_2/interface_macros.h
+++ b/Circular_kernel_2/include/CGAL/Circular_kernel_2/interface_macros.h
@@ -72,9 +72,9 @@
   construct_line_arc_2_object)
   CGAL_Circular_Kernel_cons(Construct_circular_arc_point_2,
   construct_circular_arc_point_2_object)
-  CGAL_Circular_Kernel_cons(Compute_Circular_x_2,
+  CGAL_Circular_Kernel_cons(Compute_circular_x_2,
   compute_circular_x_2_object)  
-  CGAL_Circular_Kernel_cons(Compute_Circular_y_2,
+  CGAL_Circular_Kernel_cons(Compute_circular_y_2,
   compute_circular_y_2_object)
   CGAL_Circular_Kernel_cons(Construct_circular_min_vertex_2,
   construct_circular_min_vertex_2_object)