diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp
index 01cca84..4914351 100644
--- a/include/boost/concept_check.hpp
+++ b/include/boost/concept_check.hpp
@@ -53,7 +53,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 
 #define BOOST_CLASS_REQUIRE(type_var, ns, concept) \
   typedef void (ns::concept <type_var>::* func##type_var##concept)(); \
-  template <func##type_var##concept _Tp1> \
+  template <func##type_var##concept Tp1_> \
   struct concept_checking_##type_var##concept { }; \
   typedef concept_checking_##type_var##concept< \
     BOOST_FPTR ns::concept<type_var>::constraints> \
@@ -62,7 +62,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 #define BOOST_CLASS_REQUIRE2(type_var1, type_var2, ns, concept) \
   typedef void (ns::concept <type_var1,type_var2>::* \
      func##type_var1##type_var2##concept)(); \
-  template <func##type_var1##type_var2##concept _Tp1> \
+  template <func##type_var1##type_var2##concept Tp1_> \
   struct concept_checking_##type_var1##type_var2##concept { }; \
   typedef concept_checking_##type_var1##type_var2##concept< \
     BOOST_FPTR ns::concept<type_var1,type_var2>::constraints> \
@@ -71,7 +71,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 #define BOOST_CLASS_REQUIRE3(tv1, tv2, tv3, ns, concept) \
   typedef void (ns::concept <tv1,tv2,tv3>::* \
      func##tv1##tv2##tv3##concept)(); \
-  template <func##tv1##tv2##tv3##concept _Tp1> \
+  template <func##tv1##tv2##tv3##concept Tp1_> \
   struct concept_checking_##tv1##tv2##tv3##concept { }; \
   typedef concept_checking_##tv1##tv2##tv3##concept< \
     BOOST_FPTR ns::concept<tv1,tv2,tv3>::constraints> \
@@ -80,7 +80,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 #define BOOST_CLASS_REQUIRE4(tv1, tv2, tv3, tv4, ns, concept) \
   typedef void (ns::concept <tv1,tv2,tv3,tv4>::* \
      func##tv1##tv2##tv3##tv4##concept)(); \
-  template <func##tv1##tv2##tv3##tv4##concept _Tp1> \
+  template <func##tv1##tv2##tv3##tv4##concept Tp1_> \
   struct concept_checking_##tv1##tv2##tv3##tv4##concept { }; \
   typedef concept_checking_##tv1##tv2##tv3##tv4##concept< \
     BOOST_FPTR ns::concept<tv1,tv2,tv3,tv4>::constraints> \
@@ -102,7 +102,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 
 #define BOOST_CLASS_REQUIRES(type_var, concept) \
   typedef void (concept <type_var>::* func##type_var##concept)(); \
-  template <func##type_var##concept _Tp1> \
+  template <func##type_var##concept Tp1_> \
   struct concept_checking_##type_var##concept { }; \
   typedef concept_checking_##type_var##concept< \
     BOOST_FPTR concept <type_var>::constraints> \
@@ -110,7 +110,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 
 #define BOOST_CLASS_REQUIRES2(type_var1, type_var2, concept) \
   typedef void (concept <type_var1,type_var2>::* func##type_var1##type_var2##concept)(); \
-  template <func##type_var1##type_var2##concept _Tp1> \
+  template <func##type_var1##type_var2##concept Tp1_> \
   struct concept_checking_##type_var1##type_var2##concept { }; \
   typedef concept_checking_##type_var1##type_var2##concept< \
     BOOST_FPTR concept <type_var1,type_var2>::constraints> \
@@ -118,7 +118,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 
 #define BOOST_CLASS_REQUIRES3(type_var1, type_var2, type_var3, concept) \
   typedef void (concept <type_var1,type_var2,type_var3>::* func##type_var1##type_var2##type_var3##concept)(); \
-  template <func##type_var1##type_var2##type_var3##concept _Tp1> \
+  template <func##type_var1##type_var2##type_var3##concept Tp1_> \
   struct concept_checking_##type_var1##type_var2##type_var3##concept { }; \
   typedef concept_checking_##type_var1##type_var2##type_var3##concept< \
     BOOST_FPTR concept <type_var1,type_var2,type_var3>::constraints>  \
@@ -126,7 +126,7 @@ inline void function_requires(mpl::identity<Concept>* = 0)
 
 #define BOOST_CLASS_REQUIRES4(type_var1, type_var2, type_var3, type_var4, concept) \
   typedef void (concept <type_var1,type_var2,type_var3,type_var4>::* func##type_var1##type_var2##type_var3##type_var4##concept)(); \
-  template <func##type_var1##type_var2##type_var3##type_var4##concept _Tp1> \
+  template <func##type_var1##type_var2##type_var3##type_var4##concept Tp1_> \
   struct concept_checking_##type_var1##type_var2##type_var3##type_var4##concept { }; \
   typedef concept_checking_##type_var1##type_var2##type_var3##type_var4##concept< \
     BOOST_FPTR concept <type_var1,type_var2,type_var3,type_var4>::constraints>  \