diff --git a/iter_traits_gen_test.cpp b/iter_named_param_test.cpp
similarity index 77%
rename from iter_traits_gen_test.cpp
rename to iter_named_param_test.cpp
index b0330a2..c9f5908 100644
--- a/iter_traits_gen_test.cpp
+++ b/iter_named_param_test.cpp
@@ -4,6 +4,8 @@
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
 
+// 27 June 2001 Jeremy Siek
+//     Upated for change in named params.
 // 8 Mar 2001   Jeremy Siek
 //     Initial checkin.
 
@@ -26,9 +28,8 @@ main()
 
   {
     typedef boost::iterator_adaptor<my_iter, boost::default_iterator_policies,
-      boost::iterator_traits_generator
-      ::reference<dummyT>
-      ::iterator_category<std::input_iterator_tag> > iter_type;
+      boost::reference_is<dummyT>,
+      boost::iterator_category_is<std::input_iterator_tag> > iter_type;
 
     BOOST_STATIC_ASSERT((boost::is_same<iter_type::iterator_category*,
        std::input_iterator_tag*>::value));
@@ -42,12 +43,11 @@ main()
   {
     typedef boost::iterator_adaptor<dummyT*,
       boost::default_iterator_policies,
-      boost::iterator_traits_generator
-        ::value_type<dummyT>
-        ::reference<const dummyT&>
-        ::pointer<const dummyT*> 
-        ::iterator_category<std::forward_iterator_tag>
-        ::difference_type<std::ptrdiff_t> > adaptor_type;
+      boost::value_type_is<dummyT>,
+      boost::reference_is<const dummyT&>,
+      boost::pointer_is<const dummyT*>,
+      boost::iterator_category_is<std::forward_iterator_tag>,
+      boost::difference_type_is<std::ptrdiff_t> > adaptor_type;
 
     adaptor_type i(array);
 
diff --git a/iterator_adaptor_examples.cpp b/iterator_adaptor_examples.cpp
index c7baa08..6d9d5db 100644
--- a/iterator_adaptor_examples.cpp
+++ b/iterator_adaptor_examples.cpp
@@ -21,9 +21,8 @@ main(int, char*[])
   int x[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
   typedef std::binder1st< std::multiplies<int> > Function;
-  typedef boost::transform_iterator<Function, int*, 
-    boost::iterator<std::random_access_iterator_tag, int>
-  >::type doubling_iterator;
+  typedef boost::transform_iterator_generator<Function, int*
+    >::type doubling_iterator;
 
   doubling_iterator i(x, std::bind1st(std::multiplies<int>(), 2)),
     i_end(x + sizeof(x)/sizeof(int), std::bind1st(std::multiplies<int>(), 2));