diff --git a/Filtered_kernel/include/CGAL/Filtered_predicate.h b/Filtered_kernel/include/CGAL/Filtered_predicate.h
index e86c1ba6ec5..de18d71357d 100644
--- a/Filtered_kernel/include/CGAL/Filtered_predicate.h
+++ b/Filtered_kernel/include/CGAL/Filtered_predicate.h
@@ -82,7 +82,7 @@ public:
     : ep(c2e(o1), c2e(o2)), ap(c2a(o1), c2a(o2))
   {}
 
-#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
+#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
   template <typename... Args>
   result_type
   operator()(const Args&... args) const;
@@ -145,7 +145,7 @@ public:
 #endif
 };
 
-#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
+#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 
 template <class EP, class AP, class C2E, class C2A, bool Protection>
   template <typename... Args>
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_DECLTYPE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp
similarity index 97%
rename from Installation/config/testfiles/CGAL_CFG_NO_DECLTYPE.cpp
rename to Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp
index 340ae62818d..473bb51cfe0 100644
--- a/Installation/config/testfiles/CGAL_CFG_NO_DECLTYPE.cpp
+++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DECLTYPE.cpp
@@ -24,7 +24,7 @@
 // ---------------------------------------------------------------------
 
 //| If a compiler does not support decltype() (from C++0x)
-//| CGAL_CFG_NO_DECLTYPE is set. 
+//| CGAL_CFG_NO_CPP0X_DECLTYPE is set. 
 
 #include <cassert>
 
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_DELEGATING_CONSTRUCTORS.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp
similarity index 95%
rename from Installation/config/testfiles/CGAL_CFG_NO_DELEGATING_CONSTRUCTORS.cpp
rename to Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp
index 114ec6a6003..96df24fa3b4 100644
--- a/Installation/config/testfiles/CGAL_CFG_NO_DELEGATING_CONSTRUCTORS.cpp
+++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS.cpp
@@ -24,7 +24,7 @@
 // ---------------------------------------------------------------------
 
 //| If a compiler does not support delegating constructors (from C++0x)
-//| CGAL_CFG_NO_DELEGATING_CONSTRUCTORS is set. 
+//| CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS is set. 
 
 #undef NDEBUG
 #include <cassert>
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_LONG_LONG.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NO_LONG_LONG.cpp
rename to Installation/config/testfiles/CGAL_CFG_NO_CPP0X_LONG_LONG.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_RVALUE_REFERENCE.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp
similarity index 100%
rename from Installation/config/testfiles/CGAL_CFG_NO_RVALUE_REFERENCE.cpp
rename to Installation/config/testfiles/CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE.cpp
diff --git a/Installation/config/testfiles/CGAL_CFG_NO_VARIADIC_TEMPLATES.cpp b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp
similarity index 97%
rename from Installation/config/testfiles/CGAL_CFG_NO_VARIADIC_TEMPLATES.cpp
rename to Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp
index 4ac9b2465a6..1355a25df3a 100644
--- a/Installation/config/testfiles/CGAL_CFG_NO_VARIADIC_TEMPLATES.cpp
+++ b/Installation/config/testfiles/CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES.cpp
@@ -24,7 +24,7 @@
 // ---------------------------------------------------------------------
 
 //| If a compiler does not support variadic templates (from C++0x)
-//| CGAL_CFG_NO_VARIADIC_TEMPLATES is set. 
+//| CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES is set. 
 
 #undef NDEBUG
 #include <cassert>
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index fb1ca99601f..4e35d62504e 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -65,7 +65,7 @@
 #define CGAL_BEGIN_NAMESPACE namespace CGAL {
 #define CGAL_END_NAMESPACE }
 
-#ifndef CGAL_CFG_NO_LONG_LONG
+#ifndef CGAL_CFG_NO_CPP0X_LONG_LONG
 #  define CGAL_USE_LONG_LONG
 #endif
 
diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
index f695d8dbac8..4c55f8ed3fb 100644
--- a/STL_Extension/include/CGAL/Compact_container.h
+++ b/STL_Extension/include/CGAL/Compact_container.h
@@ -203,7 +203,7 @@ public:
 
   // Special insert methods that construct the objects in place
   // (just forward the arguments to the constructor, to optimize a copy).
-#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
+#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
   template < typename... Args >
   iterator
   emplace(const Args&... args)
@@ -359,7 +359,7 @@ public:
     ++size_;
     return iterator(ret, 0);
   }
-#endif // CGAL_CFG_NO_VARIADIC_TEMPLATES
+#endif // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 
   iterator insert(const T &t)
   {
diff --git a/STL_Extension/include/CGAL/array.h b/STL_Extension/include/CGAL/array.h
index b92a814ffd2..498e8849d30 100644
--- a/STL_Extension/include/CGAL/array.h
+++ b/STL_Extension/include/CGAL/array.h
@@ -41,7 +41,7 @@ namespace CGALi {
 // Hopefully C++0x will fix this properly with initializer_lists.
 // So, it's temporary, therefore I do not document it and keep it internal.
 
-#ifndef CGAL_CFG_NO_VARIADIC_TEMPLATES
+#ifndef CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 
 template< typename T, typename... Args >
 inline
@@ -52,7 +52,7 @@ make_array(const T & t, const Args & ... args)
   return a;
 }
 
-#else // CGAL_CFG_NO_VARIADIC_TEMPLATES
+#else // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 
 template < typename T > inline
 boost::array<T, 1>
@@ -104,7 +104,7 @@ make_array(const T& b1, const T& b2, const T& b3, const T& b4, const T& b5,
 }
 
 
-#endif // CGAL_CFG_NO_VARIADIC_TEMPLATES
+#endif // CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
 
 } // namespace CGALi