diff --git a/doc/acknowledgements.xml b/doc/acknowledgements.xml
index 9fce412a..f9889592 100644
--- a/doc/acknowledgements.xml
+++ b/doc/acknowledgements.xml
@@ -15,11 +15,11 @@ last-revision="$Date$">
   , 
   <code>thread_pool</code>
   , 
-  <code>rw_mutex</code>
+  <code>read_write_mutex</code>
   , 
-  <code>rw_try_mutex</code>
+  <code>read_write_try_mutex</code>
   and 
-  <code>rw_timed_mutex</code>
+  <code>read_write_timed_mutex</code>
   classes.</para>
   <para>Important contributions were also made by Jeremy Siek (lots of input
   on the design and on the implementation), Alexander Terekhov (lots of input
diff --git a/doc/concepts.xml b/doc/concepts.xml
index f1f92755..43a418c4 100644
--- a/doc/concepts.xml
+++ b/doc/concepts.xml
@@ -1354,7 +1354,7 @@
 								</entry>
 							</row>
 							<row> 
-								<entry><code>M::scoped_rw_lock</code></entry>
+								<entry><code>M::scoped_read_write_lock</code></entry>
 								<entry>A type meeting the 
 								<link linkend="threads.concepts.ScopedReadWriteMutex">ScopedReadWriteLock</link>
 								requirements. </entry>
@@ -1387,7 +1387,7 @@
 
 						<tbody>
 							<row> 
-								<entry><code>M::scoped_try_rw_lock</code></entry>
+								<entry><code>M::scoped_try_read_write_lock</code></entry>
 								<entry>A type meeting the 
 								<link linkend="threads.concepts.ScopedReadWriteMutex">ScopedTryReadWriteLock</link>
 								requirements.</entry>
@@ -1420,7 +1420,7 @@
 
 						<tbody>
 							<row> 
-								<entry><code>M::scoped_timed_rw_lock</code></entry>
+								<entry><code>M::scoped_timed_read_write_lock</code></entry>
 								<entry>A type meeting the 
 								<link linkend="threads.concepts.ScopedReadWriteMutex">ScopedTimedReadWriteLock</link> 
 								requirements.</entry>
diff --git a/doc/reference.xml b/doc/reference.xml
index 2b06ec66..1779b072 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -13,7 +13,7 @@
   <xi:include href="mutex-ref.xml"/>
   <xi:include href="once-ref.xml"/>
   <xi:include href="recursive_mutex-ref.xml"/>
-  <xi:include href="rw_mutex-ref.xml"/>
+  <xi:include href="read_write_mutex-ref.xml"/>
   <xi:include href="thread-ref.xml"/>
   <xi:include href="tss-ref.xml"/>
   <xi:include href="xtime-ref.xml"/>
diff --git a/test/Jamfile b/test/Jamfile
index bc64bf7a..549371c4 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -52,7 +52,7 @@ import testing ;
           [ run test_once.cpp <template>test ]
           [ run test_xtime.cpp <template>test ]
           [ run test_barrier.cpp <template>test ]
-#          [ run test_rw_mutex.cpp <template>test ]
+#          [ run test_read_write_mutex.cpp <template>test ]
           [ run test_thread_pool.cpp <template>test ]
     ;
 }