diff --git a/include/boost/test/impl/test_tree.ipp b/include/boost/test/impl/test_tree.ipp
index f17a63567a..9654718402 100644
--- a/include/boost/test/impl/test_tree.ipp
+++ b/include/boost/test/impl/test_tree.ipp
@@ -501,16 +501,16 @@ auto_test_unit_registrar::auto_test_unit_registrar( const_string ts_name, const_
 
 //____________________________________________________________________________//
 
-auto_test_unit_registrar::auto_test_unit_registrar( test_unit_generator const& tc_gen, decorator::collector_t& decorators )
+auto_test_unit_registrar::auto_test_unit_registrar( test_unit_generator const& tc_generator, decorator::collector_t& decorators )
 {
-    framework::current_auto_test_suite().add( tc_gen, decorators );
+    framework::current_auto_test_suite().add( tc_generator, decorators );
 }
 
 //____________________________________________________________________________//
 
-auto_test_unit_registrar::auto_test_unit_registrar( boost::shared_ptr<test_unit_generator> tc_gen, decorator::collector_t& decorators )
+auto_test_unit_registrar::auto_test_unit_registrar( boost::shared_ptr<test_unit_generator> tc_generator, decorator::collector_t& decorators )
 {
-    framework::current_auto_test_suite().add( tc_gen, decorators );
+    framework::current_auto_test_suite().add( tc_generator, decorators );
 }
 
 
diff --git a/include/boost/test/tree/auto_registration.hpp b/include/boost/test/tree/auto_registration.hpp
index e9510be292..39f4bc4e27 100644
--- a/include/boost/test/tree/auto_registration.hpp
+++ b/include/boost/test/tree/auto_registration.hpp
@@ -39,8 +39,8 @@ struct BOOST_TEST_DECL auto_test_unit_registrar {
     // Constructors
                 auto_test_unit_registrar( test_case* tc, decorator::collector_t& decorators, counter_t exp_fail = 0 );
     explicit    auto_test_unit_registrar( const_string ts_name, const_string ts_file, std::size_t ts_line, decorator::collector_t& decorators );
-    explicit    auto_test_unit_registrar( test_unit_generator const& tc_gen, decorator::collector_t& decorators );
-    explicit    auto_test_unit_registrar( boost::shared_ptr<test_unit_generator>  tc_gen, decorator::collector_t& decorators );
+    explicit    auto_test_unit_registrar( test_unit_generator const& tc_generator, decorator::collector_t& decorators );
+    explicit    auto_test_unit_registrar( boost::shared_ptr<test_unit_generator>  tc_generator, decorator::collector_t& decorators );
     explicit    auto_test_unit_registrar( int );
 };