diff --git a/Packages/Configuration/changes.txt b/Packages/Configuration/changes.txt
index c6670d3280c..9b31479f0d2 100644
--- a/Packages/Configuration/changes.txt
+++ b/Packages/Configuration/changes.txt
@@ -1,3 +1,6 @@
+2.40
+- CGAL_CFG_LONGNAME_PROBLEM moved to CGAL_CFG_LONGNAME_BUG
+
 2.39
 - 2 files were added CGAL_CFG_LONGNAME_PROBLEM.C in test/Configuration and testfiles
 - CGAL_CFG_NO_LONGNAME_PROBLEM.C will be removed next release.
diff --git a/Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_PROBLEM.C b/Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_BUG.C
similarity index 92%
rename from Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_PROBLEM.C
rename to Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_BUG.C
index f36216264e2..c98d5005869 100644
--- a/Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_PROBLEM.C
+++ b/Packages/Configuration/config/testfiles/CGAL_CFG_LONGNAME_BUG.C
@@ -7,7 +7,7 @@
 // release       : $CGAL_Revision: CGAL-2.2-I-2 $
 // release_date  : $CGAL_Date: 2000/02/04 $
 //
-// file          : config/testfiles/CGAL_CFG_LONGNAME_PROBLEM.C
+// file          : config/testfiles/CGAL_CFG_LONGNAME_BUG.C
 // package       : Configuration (2.1)
 // author(s)     : various
 //
@@ -15,7 +15,7 @@
 //
 // ======================================================================
 
-// CGAL_CFG_LONGNAME_PROBLEM.C
+// CGAL_CFG_LONGNAME_BUG.C
 // ---------------------------------------------------------------------
 // A short test program to evaluate a C++ compiler.
 // This program is used by cgal_configure.
@@ -23,7 +23,7 @@
 // ---------------------------------------------------------------------
 
 //| If a compiler (or assembler or linker) has problems with long names
-//| CGAL_CFG_LONGNAME_PROBLEM is set.
+//| CGAL_CFG_LONGNAME_BUG is set.
 
 #pragma warning( error : 4503)
 
diff --git a/Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_PROBLEM.C b/Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_BUG.C
similarity index 92%
rename from Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_PROBLEM.C
rename to Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_BUG.C
index f36216264e2..c98d5005869 100644
--- a/Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_PROBLEM.C
+++ b/Packages/Configuration/test/Configuration/CGAL_CFG_LONGNAME_BUG.C
@@ -7,7 +7,7 @@
 // release       : $CGAL_Revision: CGAL-2.2-I-2 $
 // release_date  : $CGAL_Date: 2000/02/04 $
 //
-// file          : config/testfiles/CGAL_CFG_LONGNAME_PROBLEM.C
+// file          : config/testfiles/CGAL_CFG_LONGNAME_BUG.C
 // package       : Configuration (2.1)
 // author(s)     : various
 //
@@ -15,7 +15,7 @@
 //
 // ======================================================================
 
-// CGAL_CFG_LONGNAME_PROBLEM.C
+// CGAL_CFG_LONGNAME_BUG.C
 // ---------------------------------------------------------------------
 // A short test program to evaluate a C++ compiler.
 // This program is used by cgal_configure.
@@ -23,7 +23,7 @@
 // ---------------------------------------------------------------------
 
 //| If a compiler (or assembler or linker) has problems with long names
-//| CGAL_CFG_LONGNAME_PROBLEM is set.
+//| CGAL_CFG_LONGNAME_BUG is set.
 
 #pragma warning( error : 4503)