diff --git a/checks/Jamfile.v2 b/checks/Jamfile.v2
index 4d2f4373..9c9d61e5 100644
--- a/checks/Jamfile.v2
+++ b/checks/Jamfile.v2
@@ -335,7 +335,7 @@ explicit cxx14_constexpr ;
 run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX14_DECLTYPE_AUTO : cxx14_decltype_auto ;
 alias cxx14_decltype_auto : cxx14_decltype_auto.output ;
 explicit cxx14_decltype_auto ;
-run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX14_DIGIT_SEPARATOR : cxx14_digit_separator ;
+run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX14_DIGIT_SEPARATORS : cxx14_digit_separators ;
 alias cxx14_digit_separator : cxx14_digit_separator.output ;
 explicit cxx14_digit_separator ;
 run-simple test_case.cpp : : : <define>TEST_BOOST_NO_CXX14_GENERIC_LAMBDAS : cxx14_generic_lambdas ;
diff --git a/checks/test_case.cpp b/checks/test_case.cpp
index 7d21a8f3..9940abec 100644
--- a/checks/test_case.cpp
+++ b/checks/test_case.cpp
@@ -423,7 +423,7 @@ namespace test = boost_no_cxx14_decltype_auto;
 #endif
 #ifdef TEST_BOOST_NO_CXX14_DIGIT_SEPARATORS
 #  include "../test/boost_no_cxx14_digit_separator.ipp"
-namespace test = boost_no_cxx14_digit_separator;
+namespace test = boost_no_cxx14_digit_separators;
 #endif
 #ifdef TEST_BOOST_NO_CXX14_GENERIC_LAMBDAS
 #  include "../test/boost_no_cxx14_generic_lambda.ipp"
diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index fe833397..ece421c9 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -331,7 +331,7 @@ test-suite "BOOST_NO_CXX14_CONSTEXPR" :
 test-suite "BOOST_NO_CXX14_DECLTYPE_AUTO" : 
 [ run ../no_cxx14_decltype_auto_pass.cpp ]
 [ compile-fail ../no_cxx14_decltype_auto_fail.cpp ] ;
-test-suite "BOOST_NO_CXX14_DIGIT_SEPARATOR" : 
+test-suite "BOOST_NO_CXX14_DIGIT_SEPARATORS" : 
 [ run ../no_cxx14_digit_separator_pass.cpp ]
 [ compile-fail ../no_cxx14_digit_separator_fail.cpp ] ;
 test-suite "BOOST_NO_CXX14_GENERIC_LAMBDAS" : 
diff --git a/test/boost_no_cxx14_digit_separator.ipp b/test/boost_no_cxx14_digit_separator.ipp
index 3bdbbf43..ed4bcf23 100644
--- a/test/boost_no_cxx14_digit_separator.ipp
+++ b/test/boost_no_cxx14_digit_separator.ipp
@@ -11,7 +11,7 @@
 //  TITLE:         C++14 digit separator unavailable
 //  DESCRIPTION:   The compiler does not support C++14 digit separator
 
-namespace boost_no_cxx14_digit_separator
+namespace boost_no_cxx14_digit_separators
 {
 
 int test()
diff --git a/test/config_test.cpp b/test/config_test.cpp
index b266f4eb..6d2db3e4 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -280,7 +280,7 @@ namespace boost_no_cxx14_decltype_auto = empty_boost;
 #ifndef BOOST_NO_CXX14_DIGIT_SEPARATORS
 #include "boost_no_cxx14_digit_separator.ipp"
 #else
-namespace boost_no_cxx14_digit_separator = empty_boost;
+namespace boost_no_cxx14_digit_separators = empty_boost;
 #endif
 #ifndef BOOST_NO_CXX14_GENERIC_LAMBDAS
 #include "boost_no_cxx14_generic_lambda.ipp"
@@ -1501,7 +1501,7 @@ int main( int, char *[] )
       std::cerr << "Failed test for BOOST_NO_CXX14_DECLTYPE_AUTO at: " << __FILE__ << ":" << __LINE__ << std::endl;
       ++error_count;
    }
-   if(0 != boost_no_cxx14_digit_separator::test())
+   if(0 != boost_no_cxx14_digit_separators::test())
    {
       std::cerr << "Failed test for BOOST_NO_CXX14_DIGIT_SEPARATORS at: " << __FILE__ << ":" << __LINE__ << std::endl;
       ++error_count;
diff --git a/test/no_cxx14_digit_separator_fail.cpp b/test/no_cxx14_digit_separator_fail.cpp
index 8c0c06a1..59a30018 100644
--- a/test/no_cxx14_digit_separator_fail.cpp
+++ b/test/no_cxx14_digit_separator_fail.cpp
@@ -32,6 +32,6 @@
 
 int main( int, char *[] )
 {
-   return boost_no_cxx14_digit_separator::test();
+   return boost_no_cxx14_digit_separators::test();
 }
 
diff --git a/test/no_cxx14_digit_separator_pass.cpp b/test/no_cxx14_digit_separator_pass.cpp
index bb88cd29..a8814fe0 100644
--- a/test/no_cxx14_digit_separator_pass.cpp
+++ b/test/no_cxx14_digit_separator_pass.cpp
@@ -27,11 +27,11 @@
 #ifndef BOOST_NO_CXX14_DIGIT_SEPARATORS
 #include "boost_no_cxx14_digit_separator.ipp"
 #else
-namespace boost_no_cxx14_digit_separator = empty_boost;
+namespace boost_no_cxx14_digit_separators = empty_boost;
 #endif
 
 int main( int, char *[] )
 {
-   return boost_no_cxx14_digit_separator::test();
+   return boost_no_cxx14_digit_separators::test();
 }