diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index a2f9e323..6cc8b22f 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -205,23 +205,23 @@
 #  define BOOST_NO_CXX11_FINAL
 #endif
 
-#if !(__has_feature(cxx_binary_literals) || __has_extension(cxx_binary_literals))
+#if !(__has_feature(__cxx_binary_literals__) || __has_extension(__cxx_binary_literals__))
 #  define BOOST_NO_CXX14_BINARY_LITERALS
 #endif
 
-#if !(__has_feature(cxx_decltype_auto) || __has_extension(cxx_decltype_auto))
+#if !(__has_feature(__cxx_decltype_auto__) || __has_extension(__cxx_decltype_auto__))
 #  define BOOST_NO_CXX14_DECLTYPE_AUTO
 #endif
 
-#if !(__has_feature(cxx_aggregate_nsdmi) || __has_extension(cxx_aggregate_nsdmi))
+#if !(__has_feature(__cxx_aggregate_nsdmi__) || __has_extension(__cxx_aggregate_nsdmi__))
 #  define BOOST_NO_CXX14_AGGREGATE_NSDMI
 #endif
 
-#if !__has_feature(cxx_init_captures)
+#if !__has_feature(__cxx_init_captures__)
 #  define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
 #endif
 
-#if !(__has_feature(cxx_generic_lambdas) || __has_extension(cxx_generic_lambdas))
+#if !(__has_feature(__cxx_generic_lambdas__) || __has_extension(__cxx_generic_lambdas__))
 #  define BOOST_NO_CXX14_GENERIC_LAMBDAS
 #endif
 
@@ -239,16 +239,16 @@
 // so instead verify that we have a feature that was introduced at the same time as working C++14
 // constexpr (generic lambda's in this case):
 //
-#if !__has_feature(cxx_generic_lambdas) \
-  || !(__has_feature(cxx_relaxed_constexpr) || __has_extension(cxx_relaxed_constexpr))
+#if !__has_feature(__cxx_generic_lambdas__) \
+  || !(__has_feature(__cxx_relaxed_constexpr__) || __has_extension(__cxx_relaxed_constexpr__))
 #  define BOOST_NO_CXX14_CONSTEXPR
 #endif
 
-#if !(__has_feature(cxx_return_type_deduction) || __has_extension(cxx_return_type_deduction))
+#if !(__has_feature(__cxx_return_type_deduction__) || __has_extension(__cxx_return_type_deduction__))
 #  define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION
 #endif
 
-#if !__has_feature(cxx_variable_templates)
+#if !__has_feature(__cxx_variable_templates__)
 #  define BOOST_NO_CXX14_VARIABLE_TEMPLATES
 #endif