diff --git a/doc/reference.html b/doc/reference.html
index 315aedd..23d16a7 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -89,7 +89,7 @@ errno</code>.</p>
       struct is_error_condition_enum { static const bool value = false; };
 
     //  portable error_conditions
-    namespace posix
+    namespace posix_error
     {
       enum posix_errno
       {
@@ -174,9 +174,9 @@ errno</code>.</p>
         wrong_protocol_type             //EPROTOTYPE
       };
 
-    } // namespace posix
+    } // namespace posix_error
 
-    template<> struct is_error_condition_enum<posix::posix_errno>&lt;posix::posix_errno&gt;
+    template<> struct is_error_condition_enum<posix::posix_errno>&lt;posix_error::posix_errno&gt;
       { static const bool value = true; };
 
     bool operator==( const error_code &amp; lhs, const error_code &amp; rhs );
@@ -192,8 +192,8 @@ errno</code>.</p>
     bool operator&lt;( const error_code &amp; lhs, const error_code &amp; rhs );
     bool operator&lt;( const error_condition &amp; lhs, const error_condition &amp; rhs );
 
-    error_code make_error_code( posix::posix_errno e );
-    error_condition make_error_condition( posix::posix_errno e );
+    error_code make_error_code( posix_error::posix_errno e );
+    error_condition make_error_condition( posix_error::posix_errno e );
 
     template &lt;class charT, class traits&gt;
       std::basic_ostream&lt;charT,traits&gt;&amp;
@@ -607,11 +607,11 @@ bool operator!=( const error_condition &amp; condition, const error_code &amp; c
   &nbsp; || (lhs.category() == rhs.category() &amp;&amp; lhs.value() &lt; rhs.value())</code>.</p>
   <p><i>Throws: </i>Nothing.</p>
 </blockquote>
-<pre>error_code make_error_code( posix::posix_errno e );</pre>
+<pre>error_code make_error_code( posix_error::posix_errno e );</pre>
 <blockquote>
   <p><i>Returns:</i> <code>error_code( e, posix_category)</code>.</p>
 </blockquote>
-<pre>error_condition make_error_condition( posix::posix_errno e );</pre>
+<pre>error_condition make_error_condition( posix_error::posix_errno e );</pre>
 <blockquote>
   <p><i>Returns:</i> <code>error_condition( e, posix_category)</code>.</p>
 </blockquote>
@@ -699,7 +699,7 @@ Distributed under the Boost Software License, Version 1.0. See
 <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
 
 <p>Revised 
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->September 19, 2007<!--webbot bot="Timestamp" endspan i-checksum="38025" --> </font>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->October 23, 2007<!--webbot bot="Timestamp" endspan i-checksum="30853" --> </font>
 </p>
 
 </body>
diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index 74afdd2..6b39d85 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -49,9 +49,8 @@ namespace boost
 
     //  portable error_conditions  -------------------------------------------//
 
-    namespace posix
+    namespace posix_error
     {
-
       enum posix_errno
       {
         success = 0,
@@ -135,9 +134,13 @@ namespace boost
         wrong_protocol_type = EPROTOTYPE
       };
 
-    } // namespace posix
+    } // namespace posix_error
 
-    template<> struct is_error_condition_enum<posix::posix_errno>
+# ifndef BOOST_SYSTEM_NO_DEPRECATED
+    namespace posix = posix_error;
+# endif
+
+    template<> struct is_error_condition_enum<posix_error::posix_errno>
       { static const bool value = true; };
 
     //  class error_category  ------------------------------------------------//
@@ -398,9 +401,9 @@ namespace boost
         + reinterpret_cast<std::size_t>(&ec.category());
     }
 
-    //  make_* functions for posix::posix_errno  -----------------------------//
+    //  make_* functions for posix_error::posix_errno  -----------------------------//
 
-    namespace posix
+    namespace posix_error
     {
       //  explicit conversion:
       inline error_code make_error_code( posix_errno e )
@@ -478,7 +481,7 @@ namespace boost
 
 # ifdef __CYGWIN__
 
-    namespace cygwin
+    namespace cygwin_error
     {
       enum cygwin_errno
       {
@@ -486,12 +489,12 @@ namespace boost
         no_package = ENOPKG,
         no_share = ENOSHARE
       };
-    }  // namespace cygwin
+    }  // namespace cygwin_error
 
-    template<> struct is_error_code_enum<cygwin::cygwin_errno>
+    template<> struct is_error_code_enum<cygwin_error::cygwin_errno>
       { static const bool value = true; };
 
-    namespace cygwin
+    namespace cygwin_error
     {
       inline error_code make_error_code( cygwin_errno e )
         { return error_code( e, system_category ); }
@@ -499,9 +502,9 @@ namespace boost
 
 # elif defined(linux) || defined(__linux) || defined(__linux__)
 
-    namespace Linux  // linux lowercase name preempted by use as predefined macro
+    namespace linux_error
     {
-      enum linux_error
+      enum linux_errno
       {
         advertise_error = EADV,
         bad_exchange = EBADE,
@@ -556,14 +559,18 @@ namespace boost
         unattached = EUNATCH,
         unclean = EUCLEAN
       };
-    }  // namespace Linux
+    }  // namespace linux_error
 
-    template<> struct is_error_code_enum<Linux::linux_error>
+# ifndef BOOST_SYSTEM_NO_DEPRECATED
+    namespace Linux = linux_error;
+# endif
+
+    template<> struct is_error_code_enum<linux_error::linux_error_code>
       { static const bool value = true; };
 
-    namespace Linux
+    namespace linux_error
     {
-      inline error_code make_error_code( linux_error e )
+      inline error_code make_error_code( linux_error_code e )
         { return error_code( e, system_category ); }
     }
 
@@ -580,9 +587,9 @@ namespace boost
     //
     //      error_code( ::GetLastError(), system_category )
 
-    namespace windows
+    namespace windows_error
     {
-      enum windows_error
+      enum windows_error_code
       {
         success = 0,
         // These names and values are based on Windows winerror.h
@@ -646,12 +653,16 @@ namespace boost
 
     }  // namespace windows
 
-    template<> struct is_error_code_enum<windows::windows_error>
+# ifndef BOOST_SYSTEM_NO_DEPRECATED
+    namespace windows = windows_error;
+# endif
+
+    template<> struct is_error_code_enum<windows_error::windows_error_code>
       { static const bool value = true; };
 
-    namespace windows
+    namespace windows_error
     {
-      inline error_code make_error_code( windows_error e )
+      inline error_code make_error_code( windows_error_code e )
         { return error_code( e, system_category ); }
     }
 
diff --git a/src/error_code.cpp b/src/error_code.cpp
index 2515be8..684cab6 100644
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -30,7 +30,7 @@
 #include <cassert>
 
 using namespace boost::system;
-using namespace boost::system::posix;
+using namespace boost::system::posix_error;
 
 #include <cstring> // for strerror/strerror_r