diff --git a/include/boost/range/begin.hpp b/include/boost/range/begin.hpp
index 29e9fa4..17d9f84 100644
--- a/include/boost/range/begin.hpp
+++ b/include/boost/range/begin.hpp
@@ -24,7 +24,7 @@
 namespace boost
 {
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 namespace range_detail
 {
 #endif
@@ -81,7 +81,7 @@ namespace range_detail
     }
 
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 } // namespace 'range_detail'
 #endif
 
@@ -97,7 +97,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type begin( T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_begin( r );
@@ -109,7 +109,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type begin( const T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_begin( r );
diff --git a/include/boost/range/concepts.hpp b/include/boost/range/concepts.hpp
index f6f9f41..d6235d6 100644
--- a/include/boost/range/concepts.hpp
+++ b/include/boost/range/concepts.hpp
@@ -84,7 +84,7 @@ namespace boost {
     #endif
 #endif
 
-    #ifdef __BORLANDC__
+    #ifdef BOOST_BORLANDC
         #define BOOST_RANGE_ENABLE_CONCEPT_ASSERT 0
     #endif
 
diff --git a/include/boost/range/config.hpp b/include/boost/range/config.hpp
index 7600a5f..636df7b 100644
--- a/include/boost/range/config.hpp
+++ b/include/boost/range/config.hpp
@@ -23,7 +23,7 @@
 #error "macro already defined!"
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 # define BOOST_RANGE_DEDUCED_TYPENAME typename
 #else
 #define BOOST_RANGE_DEDUCED_TYPENAME BOOST_DEDUCED_TYPENAME
diff --git a/include/boost/range/end.hpp b/include/boost/range/end.hpp
index 1bf10ca..3325909 100644
--- a/include/boost/range/end.hpp
+++ b/include/boost/range/end.hpp
@@ -26,7 +26,7 @@
 namespace boost
 {
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 namespace range_detail
 {
 #endif
@@ -78,7 +78,7 @@ namespace range_detail
             return range_detail::array_end<T,sz>( a );
         }
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 } // namespace 'range_detail'
 #endif
 
@@ -91,7 +91,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<T>::type end( T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_end( r );
@@ -103,7 +103,7 @@ BOOST_CONSTEXPR
 #endif
 inline BOOST_DEDUCED_TYPENAME range_iterator<const T>::type end( const T& r )
 {
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
     using namespace range_detail;
 #endif
     return range_end( r );
diff --git a/include/boost/range/size.hpp b/include/boost/range/size.hpp
index 7f38db8..5f722d0 100644
--- a/include/boost/range/size.hpp
+++ b/include/boost/range/size.hpp
@@ -62,7 +62,7 @@ namespace boost
         BOOST_RANGE_CONCEPT_ASSERT((boost::SinglePassRangeConcept<SinglePassRange>));
 #endif
 
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) && \
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) && \
     !BOOST_WORKAROUND(__GNUC__, < 3) \
     /**/
         using namespace range_detail;
diff --git a/test/adl_conformance.cpp b/test/adl_conformance.cpp
index 8bae491..0d73b6a 100644
--- a/test/adl_conformance.cpp
+++ b/test/adl_conformance.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/algorithm_example.cpp b/test/algorithm_example.cpp
index 80c7875..bae2901 100644
--- a/test/algorithm_example.cpp
+++ b/test/algorithm_example.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/array.cpp b/test/array.cpp
index b913fde..a9bd170 100644
--- a/test/array.cpp
+++ b/test/array.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
@@ -35,7 +35,7 @@ void check_array()
 
  
 // BOOST_RANGE_NO_STATIC_ASSERT 
-#if !defined( __BORLANDC__ )
+#if !defined( BOOST_BORLANDC )
 #else
     BOOST_STATIC_ASSERT(( is_same< range_value<array_t>::type, int >::value ));
     BOOST_STATIC_ASSERT(( is_same< range_iterator<array_t>::type, int* >::value ));
diff --git a/test/begin.cpp b/test/begin.cpp
index f014535..91f50ce 100644
--- a/test/begin.cpp
+++ b/test/begin.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/const_ranges.cpp b/test/const_ranges.cpp
index 22bf83c..2410869 100644
--- a/test/const_ranges.cpp
+++ b/test/const_ranges.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/end.cpp b/test/end.cpp
index c885555..b73a532 100644
--- a/test/end.cpp
+++ b/test/end.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/extension_mechanism.cpp b/test/extension_mechanism.cpp
index b8b7112..7c735c3 100644
--- a/test/extension_mechanism.cpp
+++ b/test/extension_mechanism.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/extension_size.cpp b/test/extension_size.cpp
index b9cc1b2..dbff55b 100644
--- a/test/extension_size.cpp
+++ b/test/extension_size.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/iterator_pair.cpp b/test/iterator_pair.cpp
index 7b615a9..19e5acd 100644
--- a/test/iterator_pair.cpp
+++ b/test/iterator_pair.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/iterator_range.cpp b/test/iterator_range.cpp
index 9bbcff2..fd534bb 100644
--- a/test/iterator_range.cpp
+++ b/test/iterator_range.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
@@ -47,7 +47,7 @@ void check_iterator_range()
     BOOST_CHECK( !r.empty() );
     BOOST_CHECK( !r2.empty() );
 
-//#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+//#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 //    if( !(bool)r )
 //        BOOST_CHECK( false );
 //    if( !(bool)r2 )
diff --git a/test/partial_workaround.cpp b/test/partial_workaround.cpp
index edaae71..b8da415 100644
--- a/test/partial_workaround.cpp
+++ b/test/partial_workaround.cpp
@@ -13,7 +13,7 @@
 #include <boost/range/detail/implementation_help.hpp>
 #include <boost/test/test_tools.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/reversible_range.cpp b/test/reversible_range.cpp
index a3dd20c..fec18c3 100644
--- a/test/reversible_range.cpp
+++ b/test/reversible_range.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/std_container.cpp b/test/std_container.cpp
index 75a584f..f980bff 100644
--- a/test/std_container.cpp
+++ b/test/std_container.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/string.cpp b/test/string.cpp
index 9ff13f9..c7ee60a 100644
--- a/test/string.cpp
+++ b/test/string.cpp
@@ -12,7 +12,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
diff --git a/test/sub_range.cpp b/test/sub_range.cpp
index a6dbb36..6a0113e 100644
--- a/test/sub_range.cpp
+++ b/test/sub_range.cpp
@@ -11,7 +11,7 @@
 
 #include <boost/detail/workaround.hpp>
 
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 #  pragma warn -8091 // suppress warning in Boost.Test
 #  pragma warn -8057 // unused argument argc/argv in Boost.Test
 #endif
@@ -65,7 +65,7 @@ void check_sub_range()
     BOOST_CHECK_EQUAL( r.size(), s.size() );
     BOOST_CHECK_EQUAL( r2.size(), s2.size() );
 
-//#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+//#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
 //    if( !(bool)r )
 //        BOOST_CHECK( false );
 //    if( !(bool)r2 )