diff --git a/Packages/Configuration/include/CGAL/config.h b/Packages/Configuration/include/CGAL/config.h
index 78a6a0602e3..c2af86e0719 100644
--- a/Packages/Configuration/include/CGAL/config.h
+++ b/Packages/Configuration/include/CGAL/config.h
@@ -61,6 +61,7 @@
 #ifdef CGAL_CFG_NO_NAMESPACE
 #  define CGAL_USING_NAMESPACE_STD
 #  define CGAL_STD
+#  define CGAL
 #else
 #  define CGAL_USING_NAMESPACE_STD using namespace std;
 #  define CGAL_STD std
@@ -70,11 +71,11 @@
 #endif
 
 #if CGAL_USE_NAMESPACE
-#  define CGAL_NAMESPACE_BEGIN namespace CGAL {
-#  define CGAL_NAMESPACE_END }
+#  define CGAL_BEGIN_NAMESPACE namespace CGAL {
+#  define CGAL_END_NAMESPACE }
 #else
-#  define CGAL_NAMESPACE_BEGIN
-#  define CGAL_NAMESPACE_END
+#  define CGAL_BEGIN_NAMESPACE
+#  define CGAL_END_NAMESPACE
 #endif
 
 #ifdef CGAL_CFG_NO_MUTABLE
diff --git a/Packages/Configuration/version b/Packages/Configuration/version
index 2bca20e1016..0c1c34b47e6 100644
--- a/Packages/Configuration/version
+++ b/Packages/Configuration/version
@@ -1 +1 @@
-1.22 (2 Mar 1999)
+1.23 (2 Mar 1999)