diff --git a/include/boost/range/detail/begin.hpp b/include/boost/range/detail/begin.hpp
index 77f9f7e..2d9ec7a 100755
--- a/include/boost/range/detail/begin.hpp
+++ b/include/boost/range/detail/begin.hpp
@@ -105,13 +105,13 @@ namespace boost
             }
         };
 
-    } // namespace 'range_traits_detail'
+    } // namespace 'range_detail'
     
     template< typename C >
     inline BOOST_DEDUCED_TYPENAME result_iterator_of<C>::type 
     begin( C& c )
     {
-        return range_traits_detail::range_begin< BOOST_DEDUCED_TYPENAME range_traits_detail::range<C>::type >::fun( c );
+        return range_detail::range_begin< BOOST_DEDUCED_TYPENAME range_detail::range<C>::type >::fun( c );
     }
     
 } // namespace 'boost'
diff --git a/include/boost/range/detail/empty.hpp b/include/boost/range/detail/empty.hpp
index 36a3940..d453e51 100755
--- a/include/boost/range/detail/empty.hpp
+++ b/include/boost/range/detail/empty.hpp
@@ -18,14 +18,14 @@ namespace boost
     namespace range_detail
     {
         template< typename T >
-        struct collection_empty;
+        struct range_empty;
 
         //////////////////////////////////////////////////////////////////////
         // default
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_empty<std_container_>
+        struct range_empty<std_container_>
         {
             template< typename C >
             static bool fun( C& c )
@@ -39,7 +39,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_empty<std_pair_>
+        struct range_empty<std_pair_>
         {
             template< typename P >
             static bool fun( const P& p )
@@ -53,7 +53,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_empty<array_>
+        struct range_empty<array_>
         {
             template< typename T, std::size_t sz >
             static bool fun( T BOOST_ARRAY_REF[sz] )
@@ -69,7 +69,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_empty<char_ptr_>
+        struct range_empty<char_ptr_>
         {
             static bool fun( const char* s )
             {
@@ -78,7 +78,7 @@ namespace boost
         };
 
         template<>
-        struct collection_empty<const_char_ptr_>
+        struct range_empty<const_char_ptr_>
         {
             static bool fun( const char* s )
             {
@@ -87,7 +87,7 @@ namespace boost
         };
 
         template<>
-        struct collection_empty<wchar_t_ptr_>
+        struct range_empty<wchar_t_ptr_>
         {
             static bool fun( const wchar_t* s )
             {
@@ -96,7 +96,7 @@ namespace boost
         };
         
         template<>
-        struct collection_empty<const_wchar_t_ptr_>
+        struct range_empty<const_wchar_t_ptr_>
         {
             static bool fun( const wchar_t* s )
             {
@@ -111,7 +111,7 @@ namespace boost
     inline bool 
     empty( const C& c )
     {
-        return range_detail::collection_empty<  BOOST_RANGE_DEDUCED_TYPENAME range_detail::collection<C>::type >::fun( c );
+        return range_detail::range_empty<  BOOST_RANGE_DEDUCED_TYPENAME range_detail::range<C>::type >::fun( c );
     }
 
 } // namespace 'boost'
diff --git a/include/boost/range/detail/implementation_help.hpp b/include/boost/range/detail/implementation_help.hpp
index 3c904f5..8778b67 100755
--- a/include/boost/range/detail/implementation_help.hpp
+++ b/include/boost/range/detail/implementation_help.hpp
@@ -116,13 +116,13 @@ namespace boost
         {
             return sz;
         }
-        
+       
         template< typename T, std::size_t sz >
         inline std::size_t array_size( const T BOOST_RANGE_ARRAY_REF()[sz], int )
         {
             return sz;
         }
-                
+
         template< typename T, std::size_t sz >
         inline std::size_t array_size( T BOOST_RANGE_ARRAY_REF()[sz], char_or_wchar_t_array_tag )
         {
diff --git a/include/boost/range/detail/size.hpp b/include/boost/range/detail/size.hpp
index 40b8d9a..eaf27f7 100755
--- a/include/boost/range/detail/size.hpp
+++ b/include/boost/range/detail/size.hpp
@@ -22,14 +22,14 @@ namespace boost
     namespace range_detail
     {
         template< typename T >
-        struct collection_size;
+        struct range_size;
 
         //////////////////////////////////////////////////////////////////////
         // default
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_size<std_container_>
+        struct range_size<std_container_>
         {
             template< typename C >
             static BOOST_RANGE_DEDUCED_TYPENAME C::size_type fun( const C& c )
@@ -43,7 +43,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_size<std_pair_>
+        struct range_size<std_pair_>
         {
             template< typename P >
             static BOOST_RANGE_DEDUCED_TYPENAME size_type_of<P>::type fun( const P& p )
@@ -57,7 +57,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
         
         template<>
-        struct collection_size<array_>
+        struct range_size<array_>
         {
             template< typename T, std::size_t sz >
             static std::size_t fun( T BOOST_ARRAY_REF[sz] )
@@ -67,7 +67,7 @@ namespace boost
         };
         
         template<>
-        struct collection_size<char_array_>
+        struct range_size<char_array_>
         {
             template< typename T, std::size_t sz >
             static std::size_t fun( T BOOST_ARRAY_REF[sz] )
@@ -77,7 +77,7 @@ namespace boost
         };
         
         template<>
-        struct collection_size<wchar_t_array_>
+        struct range_size<wchar_t_array_>
         {
             template< typename T, std::size_t sz >
             static std::size_t fun( T BOOST_ARRAY_REF[sz] )
@@ -91,7 +91,7 @@ namespace boost
         //////////////////////////////////////////////////////////////////////
 
         template<>
-        struct collection_size<char_ptr_>
+        struct range_size<char_ptr_>
         {
             static std::size_t fun( const char* s )
             {
@@ -100,7 +100,7 @@ namespace boost
         };
 
         template<>
-        struct collection_size<const_char_ptr_>
+        struct range_size<const_char_ptr_>
         {
             static std::size_t fun( const char* s )
             {
@@ -109,7 +109,7 @@ namespace boost
         };
         
         template<>
-        struct collection_size<wchar_t_ptr_>
+        struct range_size<wchar_t_ptr_>
         {
             static std::size_t fun( const wchar_t* s )
             {
@@ -118,7 +118,7 @@ namespace boost
         };
 
         template<>
-        struct collection_size<const_wchar_t_ptr_>
+        struct range_size<const_wchar_t_ptr_>
         {
             static std::size_t fun( const wchar_t* s )
             {
@@ -133,7 +133,7 @@ namespace boost
     BOOST_RANGE_DEDUCED_TYPENAME size_type_of<C>::type 
     size( const C& c )
     {
-        return range_detail::collection_size<  BOOST_RANGE_DEDUCED_TYPENAME range_detail::collection<C>::type >::fun( c );
+        return range_detail::range_size<  BOOST_RANGE_DEDUCED_TYPENAME range_detail::range<C>::type >::fun( c );
     }
     
 } // namespace 'boost'
diff --git a/include/boost/range/end.hpp b/include/boost/range/end.hpp
index c67fdcb..76e757e 100755
--- a/include/boost/range/end.hpp
+++ b/include/boost/range/end.hpp
@@ -71,13 +71,13 @@ namespace range
         template< typename T, std::size_t sz >
         inline const T* end( const T (&array)[sz] )
         {
-            return range_detail::array_end( array ); 
+            return range_detail::array_end<const T,sz>( array ); 
         }
         
         template< typename T, std::size_t sz >
         inline T* end( T (&array)[sz] )
         {
-            return range_detail::array_end( array ); 
+            return range_detail::array_end<T,sz>( array ); 
         }
 
         //////////////////////////////////////////////////////////////////////
diff --git a/include/boost/range/size.hpp b/include/boost/range/size.hpp
index 0698f20..2db5261 100755
--- a/include/boost/range/size.hpp
+++ b/include/boost/range/size.hpp
@@ -58,13 +58,13 @@ namespace range
         template< typename T, std::size_t sz >
         inline std::size_t size( const T (&array)[sz] )
         {
-            return range_detail::array_size( array ); 
+            return range_detail::array_size<const T,sz>( array ); 
         }
         
         template< typename T, std::size_t sz >
         inline std::size_t size( T (&array)[sz] )
         {
-            return range_detail::array_size( array );
+            return boost::range_detail::array_size<T,sz>( array );
         }
         
         //////////////////////////////////////////////////////////////////////