diff --git a/Old_Packages/C2/test/Kernel/makefile b/Old_Packages/C2/test/Kernel/makefile
index 88284422fc6..1955233a1d6 100644
--- a/Old_Packages/C2/test/Kernel/makefile
+++ b/Old_Packages/C2/test/Kernel/makefile
@@ -22,6 +22,8 @@ CXXFLAGS = \
            $(CGAL_CXXFLAGS) \
            $(EXTRA_FLAGS) -Wall -W
 
+# REMOVE THE LINE WITH -DCGAL_CFG_NO_ADVANCED_KERNEL TO TRY MICHAEL'S DESIGN
+
 #---------------------------------------------------------------------#
 #                    linker flags
 #---------------------------------------------------------------------#
diff --git a/Old_Packages/C2/test/Kernel/test_kernelC2.C b/Old_Packages/C2/test/Kernel/test_kernelC2.C
index aab37bccd54..6f177afeb37 100644
--- a/Old_Packages/C2/test/Kernel/test_kernelC2.C
+++ b/Old_Packages/C2/test/Kernel/test_kernelC2.C
@@ -26,7 +26,7 @@
 #endif // CGAL_BASIC_H
 #include <cassert>
 #ifndef CGAL_CARTESIAN_H
-#include <CGAL/Cartesian_2.h>
+#include <CGAL/Cartesian.h>
 #endif // CGAL_CARTESIAN_H
 #include <CGAL/_test_2.C>
 #include <CGAL/leda_real.h>
@@ -34,7 +34,7 @@
 int
 main()
 {
-  typedef   CGAL::Cartesian_2<leda_real>     Cls;
+  typedef   CGAL::Cartesian<leda_real>     Cls;
   std::cout << "Testing 2d with Cartesian<double> :" << std::endl;
   _test_2( Cls() );
   return 0;