diff --git a/example/grep/grep.cpp b/example/grep/grep.cpp
index 05e4200c..32f6a142 100644
--- a/example/grep/grep.cpp
+++ b/example/grep/grep.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/captures_example.cpp b/example/snippets/captures_example.cpp
index eafced6b..d1ff1e9f 100644
--- a/example/snippets/captures_example.cpp
+++ b/example/snippets/captures_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003-2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/credit_card_example.cpp b/example/snippets/credit_card_example.cpp
index b1e0e7c8..cb7f8d52 100644
--- a/example/snippets/credit_card_example.cpp
+++ b/example/snippets/credit_card_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/icu_example.cpp b/example/snippets/icu_example.cpp
index 49eec8c3..879b0bfd 100644
--- a/example/snippets/icu_example.cpp
+++ b/example/snippets/icu_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/mfc_example.cpp b/example/snippets/mfc_example.cpp
index 4a940e4e..4b3ae62b 100644
--- a/example/snippets/mfc_example.cpp
+++ b/example/snippets/mfc_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/partial_regex_grep.cpp b/example/snippets/partial_regex_grep.cpp
index 0e4e7f65..aba09113 100644
--- a/example/snippets/partial_regex_grep.cpp
+++ b/example/snippets/partial_regex_grep.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/partial_regex_match.cpp b/example/snippets/partial_regex_match.cpp
index 1768cd57..36d23144 100644
--- a/example/snippets/partial_regex_match.cpp
+++ b/example/snippets/partial_regex_match.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_grep_example_1.cpp b/example/snippets/regex_grep_example_1.cpp
index 35bd8259..13161dfb 100644
--- a/example/snippets/regex_grep_example_1.cpp
+++ b/example/snippets/regex_grep_example_1.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_grep_example_2.cpp b/example/snippets/regex_grep_example_2.cpp
index 18e52b5c..73b6bc2c 100644
--- a/example/snippets/regex_grep_example_2.cpp
+++ b/example/snippets/regex_grep_example_2.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_grep_example_3.cpp b/example/snippets/regex_grep_example_3.cpp
index 22f2e441..b20a29aa 100644
--- a/example/snippets/regex_grep_example_3.cpp
+++ b/example/snippets/regex_grep_example_3.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_grep_example_4.cpp b/example/snippets/regex_grep_example_4.cpp
index aa281b51..5217f1c1 100644
--- a/example/snippets/regex_grep_example_4.cpp
+++ b/example/snippets/regex_grep_example_4.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_iterator_example.cpp b/example/snippets/regex_iterator_example.cpp
index 2f493dbc..e0fab2fb 100644
--- a/example/snippets/regex_iterator_example.cpp
+++ b/example/snippets/regex_iterator_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_match_example.cpp b/example/snippets/regex_match_example.cpp
index 131b36a5..a711ffd4 100644
--- a/example/snippets/regex_match_example.cpp
+++ b/example/snippets/regex_match_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_merge_example.cpp b/example/snippets/regex_merge_example.cpp
index 3f3b10a6..9b226ecd 100644
--- a/example/snippets/regex_merge_example.cpp
+++ b/example/snippets/regex_merge_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_replace_example.cpp b/example/snippets/regex_replace_example.cpp
index 36875edf..75f44eda 100644
--- a/example/snippets/regex_replace_example.cpp
+++ b/example/snippets/regex_replace_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_search_example.cpp b/example/snippets/regex_search_example.cpp
index a3287eb0..52a296b6 100644
--- a/example/snippets/regex_search_example.cpp
+++ b/example/snippets/regex_search_example.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_split_example_1.cpp b/example/snippets/regex_split_example_1.cpp
index 45636da8..10d64036 100644
--- a/example/snippets/regex_split_example_1.cpp
+++ b/example/snippets/regex_split_example_1.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_split_example_2.cpp b/example/snippets/regex_split_example_2.cpp
index 8bad385b..8a0e6919 100644
--- a/example/snippets/regex_split_example_2.cpp
+++ b/example/snippets/regex_split_example_2.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_token_iterator_eg_1.cpp b/example/snippets/regex_token_iterator_eg_1.cpp
index e49bf0a3..fbf7f5b0 100644
--- a/example/snippets/regex_token_iterator_eg_1.cpp
+++ b/example/snippets/regex_token_iterator_eg_1.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 12003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/snippets/regex_token_iterator_eg_2.cpp b/example/snippets/regex_token_iterator_eg_2.cpp
index 35a52ace..5ff1fec8 100644
--- a/example/snippets/regex_token_iterator_eg_2.cpp
+++ b/example/snippets/regex_token_iterator_eg_2.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/example/timer/regex_timer.cpp b/example/timer/regex_timer.cpp
index f6fd1761..cf514825 100644
--- a/example/timer/regex_timer.cpp
+++ b/example/timer/regex_timer.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip1.cpp b/old_include/tests/snip1.cpp
index 9cc21c2e..972a881a 100644
--- a/old_include/tests/snip1.cpp
+++ b/old_include/tests/snip1.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip2.cpp b/old_include/tests/snip2.cpp
index 4b1fa2fc..7f0218e6 100644
--- a/old_include/tests/snip2.cpp
+++ b/old_include/tests/snip2.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip3.cpp b/old_include/tests/snip3.cpp
index 8cd33c4d..2038cdb1 100644
--- a/old_include/tests/snip3.cpp
+++ b/old_include/tests/snip3.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip4.cpp b/old_include/tests/snip4.cpp
index 1506e23e..a83e6631 100644
--- a/old_include/tests/snip4.cpp
+++ b/old_include/tests/snip4.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip5.cpp b/old_include/tests/snip5.cpp
index 92189050..ded9d634 100644
--- a/old_include/tests/snip5.cpp
+++ b/old_include/tests/snip5.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip6.cpp b/old_include/tests/snip6.cpp
index 0d9587a3..de7c22e8 100644
--- a/old_include/tests/snip6.cpp
+++ b/old_include/tests/snip6.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/old_include/tests/snip7.cpp b/old_include/tests/snip7.cpp
index 774faee6..00dd7f70 100644
--- a/old_include/tests/snip7.cpp
+++ b/old_include/tests/snip7.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2000
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/command_line.cpp b/performance/command_line.cpp
index 79b90a19..2e79cdb6 100644
--- a/performance/command_line.cpp
+++ b/performance/command_line.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002-2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/main.cpp b/performance/main.cpp
index 486cb8da..203f6bd5 100644
--- a/performance/main.cpp
+++ b/performance/main.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/regex_comparison.hpp b/performance/regex_comparison.hpp
index a16dc138..271a4823 100644
--- a/performance/regex_comparison.hpp
+++ b/performance/regex_comparison.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_boost.cpp b/performance/time_boost.cpp
index 52d27bab..8355eecb 100644
--- a/performance/time_boost.cpp
+++ b/performance/time_boost.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_dynamic_xpressive.cpp b/performance/time_dynamic_xpressive.cpp
index cf81ec63..fbe8a749 100644
--- a/performance/time_dynamic_xpressive.cpp
+++ b/performance/time_dynamic_xpressive.cpp
@@ -1,7 +1,7 @@
 /*
 *
 * Copyright (c) 2002
-* Dr John Maddock
+* John Maddock
 *
 * All rights reserved.
 * May not be transfered or disclosed to a third party without
diff --git a/performance/time_greta.cpp b/performance/time_greta.cpp
index 7653c6ce..62c902a0 100644
--- a/performance/time_greta.cpp
+++ b/performance/time_greta.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_localised_boost.cpp b/performance/time_localised_boost.cpp
index 4e973e2f..9729a0bd 100644
--- a/performance/time_localised_boost.cpp
+++ b/performance/time_localised_boost.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_pcre.cpp b/performance/time_pcre.cpp
index 94ebbf81..ea649776 100644
--- a/performance/time_pcre.cpp
+++ b/performance/time_pcre.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_posix.cpp b/performance/time_posix.cpp
index 54e5cb98..6027f180 100644
--- a/performance/time_posix.cpp
+++ b/performance/time_posix.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/performance/time_safe_greta.cpp b/performance/time_safe_greta.cpp
index cbf856b8..3366db54 100644
--- a/performance/time_safe_greta.cpp
+++ b/performance/time_safe_greta.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index a33f7b17..a34e38f7 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 7ed0be7d..925a2d1f 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/cregex.cpp b/src/cregex.cpp
index 71b3943e..1c99ba5f 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index a4b2821f..2ae3fb1f 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/icu.cpp b/src/icu.cpp
index e78660ad..dd5bfb1c 100644
--- a/src/icu.cpp
+++ b/src/icu.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/instances.cpp b/src/instances.cpp
index 06dd3b68..69d72ad6 100644
--- a/src/instances.cpp
+++ b/src/instances.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index b31947ee..d5a05516 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/regex.cpp b/src/regex.cpp
index 9a40322c..74146532 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/regex_debug.cpp b/src/regex_debug.cpp
index 75a0f329..9306a82e 100644
--- a/src/regex_debug.cpp
+++ b/src/regex_debug.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/regex_raw_buffer.cpp b/src/regex_raw_buffer.cpp
index d2d8642b..7a8de803 100644
--- a/src/regex_raw_buffer.cpp
+++ b/src/regex_raw_buffer.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/regex_traits_defaults.cpp b/src/regex_traits_defaults.cpp
index e48d25ce..b76eed88 100644
--- a/src/regex_traits_defaults.cpp
+++ b/src/regex_traits_defaults.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/static_mutex.cpp b/src/static_mutex.cpp
index fb56083f..01eb7dd5 100644
--- a/src/static_mutex.cpp
+++ b/src/static_mutex.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/usinstances.cpp b/src/usinstances.cpp
index b8d0bd27..b26614ed 100644
--- a/src/usinstances.cpp
+++ b/src/usinstances.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index d8a29f77..aedf0ba5 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp
index 454b0032..06cefd2c 100644
--- a/src/wc_regex_traits.cpp
+++ b/src/wc_regex_traits.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index b02e1c0e..d5135f76 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/src/winstances.cpp b/src/winstances.cpp
index d9957578..1e0b8596 100644
--- a/src/winstances.cpp
+++ b/src/winstances.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/c_compiler_checks/posix_api_check.cpp b/test/c_compiler_checks/posix_api_check.cpp
index 6f450845..1611283b 100644
--- a/test/c_compiler_checks/posix_api_check.cpp
+++ b/test/c_compiler_checks/posix_api_check.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/c_compiler_checks/wide_posix_api_check.cpp b/test/c_compiler_checks/wide_posix_api_check.cpp
index c38cbc66..7e699f03 100644
--- a/test/c_compiler_checks/wide_posix_api_check.cpp
+++ b/test/c_compiler_checks/wide_posix_api_check.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/captures/captures_test.cpp b/test/captures/captures_test.cpp
index 83f23c5a..58779efb 100644
--- a/test/captures/captures_test.cpp
+++ b/test/captures/captures_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the
  * Boost Software License, Version 1.0. (See accompanying file
diff --git a/test/concepts/concept_check.cpp b/test/concepts/concept_check.cpp
index 8638e2d9..42e9859d 100644
--- a/test/concepts/concept_check.cpp
+++ b/test/concepts/concept_check.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -86,7 +86,7 @@ int main()
          regex_traits_tester_type1
       >
    >();
-#ifndef __MWERKS__ // MWCW tries to instantiate std::basic_string<boost::char_architype>, not sure whose bug this is....
+#if !defined(__MWERKS__) && !defined(__SUNPRO_CC) // MWCW tries to instantiate std::basic_string<boost::char_architype>, not sure whose bug this is....
    typedef boost::basic_regex<boost::char_architype, boost::regex_traits_architype<boost::char_architype> > regex_traits_tester_type2;
    boost::function_requires<
       boost::BaseRegexConcept<
diff --git a/test/concepts/icu_concept_check.cpp b/test/concepts/icu_concept_check.cpp
index bf0d3fcb..59fd2a04 100644
--- a/test/concepts/icu_concept_check.cpp
+++ b/test/concepts/icu_concept_check.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/config_info/regex_config_info.cpp b/test/config_info/regex_config_info.cpp
index 3d694515..b9978a37 100644
--- a/test/config_info/regex_config_info.cpp
+++ b/test/config_info/regex_config_info.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2003
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/object_cache/object_cache_test.cpp b/test/object_cache/object_cache_test.cpp
index 3b82c3ff..354ea2bc 100644
--- a/test/object_cache/object_cache_test.cpp
+++ b/test/object_cache/object_cache_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/pathology/bad_expression_test.cpp b/test/pathology/bad_expression_test.cpp
index 4fd3b7b4..6b34587e 100644
--- a/test/pathology/bad_expression_test.cpp
+++ b/test/pathology/bad_expression_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/pathology/recursion_test.cpp b/test/pathology/recursion_test.cpp
index 728dd229..750fd652 100644
--- a/test/pathology/recursion_test.cpp
+++ b/test/pathology/recursion_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2002
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/basic_tests.cpp b/test/regress/basic_tests.cpp
index d247a887..2c552542 100644
--- a/test/regress/basic_tests.cpp
+++ b/test/regress/basic_tests.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/info.hpp b/test/regress/info.hpp
index 5cc540d8..c8e0120a 100644
--- a/test/regress/info.hpp
+++ b/test/regress/info.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
index a6374321..fcbceee9 100644
--- a/test/regress/main.cpp
+++ b/test/regress/main.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test.hpp b/test/regress/test.hpp
index 20087643..c4840aaf 100644
--- a/test/regress/test.hpp
+++ b/test/regress/test.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_alt.cpp b/test/regress/test_alt.cpp
index 01d7b2a9..78676668 100644
--- a/test/regress/test_alt.cpp
+++ b/test/regress/test_alt.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_anchors.cpp b/test/regress/test_anchors.cpp
index 86dc67e3..9fab46cc 100644
--- a/test/regress/test_anchors.cpp
+++ b/test/regress/test_anchors.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_asserts.cpp b/test/regress/test_asserts.cpp
index 0e657950..909f5618 100644
--- a/test/regress/test_asserts.cpp
+++ b/test/regress/test_asserts.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_backrefs.cpp b/test/regress/test_backrefs.cpp
index 1a397896..f58c69f8 100644
--- a/test/regress/test_backrefs.cpp
+++ b/test/regress/test_backrefs.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_deprecated.cpp b/test/regress/test_deprecated.cpp
index ae23df9d..ef10a765 100644
--- a/test/regress/test_deprecated.cpp
+++ b/test/regress/test_deprecated.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_deprecated.hpp b/test/regress/test_deprecated.hpp
index cb4b8750..dc059506 100644
--- a/test/regress/test_deprecated.hpp
+++ b/test/regress/test_deprecated.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 1998-2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_emacs.cpp b/test/regress/test_emacs.cpp
index 3b125731..52c834b3 100644
--- a/test/regress/test_emacs.cpp
+++ b/test/regress/test_emacs.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_escapes.cpp b/test/regress/test_escapes.cpp
index 61b441d2..73cc9800 100644
--- a/test/regress/test_escapes.cpp
+++ b/test/regress/test_escapes.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_grep.cpp b/test/regress/test_grep.cpp
index 54dd62d7..b0b897d9 100644
--- a/test/regress/test_grep.cpp
+++ b/test/regress/test_grep.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp
index b6bae60b..9aa09fa9 100644
--- a/test/regress/test_icu.cpp
+++ b/test/regress/test_icu.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -46,7 +46,7 @@ void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<2> const*)
          {
             BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
          }
-         if((w1.position(i) != std::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != std::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
+         if((w1.position(i) != boost::re_detail::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != boost::re_detail::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
          {
             BOOST_REGEX_TEST_ERROR("Iterator mismatch in match_results class", UChar32);
          }
@@ -74,7 +74,7 @@ void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<1> const*)
          {
             BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
          }
-         if((w1.position(i) != std::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != std::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
+         if((w1.position(i) != boost::re_detail::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != boost::re_detail::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
          {
             BOOST_REGEX_TEST_ERROR("Iterator mismatch in match_results class", UChar32);
          }
diff --git a/test/regress/test_icu.hpp b/test/regress/test_icu.hpp
index 4e7f1491..cd90e984 100644
--- a/test/regress/test_icu.hpp
+++ b/test/regress/test_icu.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index 43bb1680..ff06d632 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_locale.hpp b/test/regress/test_locale.hpp
index 3070643c..dfc72d78 100644
--- a/test/regress/test_locale.hpp
+++ b/test/regress/test_locale.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_mfc.cpp b/test/regress/test_mfc.cpp
index a9c3a7bb..fc7265b4 100644
--- a/test/regress/test_mfc.cpp
+++ b/test/regress/test_mfc.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -170,21 +170,21 @@ void test_mfc(const char&, const test_regex_search_tag&)
 #pragma warning(push)
 #pragma warning(disable:4244)
 #endif
-      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      if(boost::re_detail::distance(s.GetString(), tstart2->first) != last_end2)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of start of field split, found: " 
-            << std::distance(s.GetString(), tstart2->first)
+            << boost::re_detail::distance(s.GetString(), tstart2->first)
             << ", expected: "
             << last_end2
             << ".", char);
       }
       int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
-      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      if(boost::re_detail::distance(s.GetString(), tstart2->second) != expected_end)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of end2 of field split, found: "
-            << std::distance(s.GetString(), tstart2->second)
+            << boost::re_detail::distance(s.GetString(), tstart2->second)
             << ", expected: "
             << expected_end
             << ".", char);
@@ -348,21 +348,21 @@ void test_mfc(const wchar_t&, const test_regex_search_tag&)
 #pragma warning(push)
 #pragma warning(disable:4244)
 #endif
-      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      if(boost::re_detail::distance(s.GetString(), tstart2->first) != last_end2)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of start of field split, found: " 
-            << std::distance(s.GetString(), tstart2->first)
+            << boost::re_detail::distance(s.GetString(), tstart2->first)
             << ", expected: "
             << last_end2
             << ".", wchar_t);
       }
       int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
-      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      if(boost::re_detail::distance(s.GetString(), tstart2->second) != expected_end)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of end2 of field split, found: "
-            << std::distance(s.GetString(), tstart2->second)
+            << boost::re_detail::distance(s.GetString(), tstart2->second)
             << ", expected: "
             << expected_end
             << ".", wchar_t);
diff --git a/test/regress/test_mfc.hpp b/test/regress/test_mfc.hpp
index 80857364..befee1c7 100644
--- a/test/regress/test_mfc.hpp
+++ b/test/regress/test_mfc.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_non_greedy_repeats.cpp b/test/regress/test_non_greedy_repeats.cpp
index 7a073c2f..4a720635 100644
--- a/test/regress/test_non_greedy_repeats.cpp
+++ b/test/regress/test_non_greedy_repeats.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_not_regex.hpp b/test/regress/test_not_regex.hpp
index ab78ca46..bd193b5c 100644
--- a/test/regress/test_not_regex.hpp
+++ b/test/regress/test_not_regex.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_partial_match.hpp b/test/regress/test_partial_match.hpp
index 3854bbb5..4ef4658f 100644
--- a/test/regress/test_partial_match.hpp
+++ b/test/regress/test_partial_match.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -47,18 +47,18 @@ void test_sub_match(const boost::sub_match<BidirectionalIterator>& sub, Bidirect
    }
    else
    {
-      if(std::distance(base, sub.first) != answer_table[2*i])
+      if(boost::re_detail::distance(base, sub.first) != answer_table[2*i])
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in start location of sub-expression " 
-            << i << ", found " << std::distance(base, sub.first) 
+            << i << ", found " << boost::re_detail::distance(base, sub.first) 
             << ", expected " << answer_table[2*i] << ".", charT);
       }
-      if(std::distance(base, sub.second) != answer_table[1+ 2*i])
+      if(boost::re_detail::distance(base, sub.second) != answer_table[1+ 2*i])
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in end location of sub-expression " 
-            << i << ", found " << std::distance(base, sub.second) 
+            << i << ", found " << boost::re_detail::distance(base, sub.second) 
             << ", expected " << answer_table[1 + 2*i] << ".", charT);
       }
    }
@@ -238,21 +238,21 @@ void test_regex_token_iterator(boost::basic_regex<charT, traits>& r)
 #pragma warning(push)
 #pragma warning(disable:4244)
 #endif
-      if(std::distance(search_text.begin(), start2->first) != last_end2)
+      if(boost::re_detail::distance(search_text.begin(), start2->first) != last_end2)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of start of field split, found: " 
-            << std::distance(search_text.begin(), start2->first)
+            << boost::re_detail::distance(search_text.begin(), start2->first)
             << ", expected: "
             << last_end2
             << ".", charT);
       }
       int expected_end = static_cast<int>(answer_table[0] < 0 ? search_text.size() : answer_table[0]);
-      if(std::distance(search_text.begin(), start2->second) != expected_end)
+      if(boost::re_detail::distance(search_text.begin(), start2->second) != expected_end)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of end2 of field split, found: "
-            << std::distance(search_text.begin(), start2->second)
+            << boost::re_detail::distance(search_text.begin(), start2->second)
             << ", expected: "
             << expected_end
             << ".", charT);
diff --git a/test/regress/test_perl_ex.cpp b/test/regress/test_perl_ex.cpp
index a63f087c..0a192ae1 100644
--- a/test/regress/test_perl_ex.cpp
+++ b/test/regress/test_perl_ex.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_regex_replace.hpp b/test/regress/test_regex_replace.hpp
index a6131ad2..53236df7 100644
--- a/test/regress/test_regex_replace.hpp
+++ b/test/regress/test_regex_replace.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
index 3854bbb5..4ef4658f 100644
--- a/test/regress/test_regex_search.hpp
+++ b/test/regress/test_regex_search.hpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -47,18 +47,18 @@ void test_sub_match(const boost::sub_match<BidirectionalIterator>& sub, Bidirect
    }
    else
    {
-      if(std::distance(base, sub.first) != answer_table[2*i])
+      if(boost::re_detail::distance(base, sub.first) != answer_table[2*i])
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in start location of sub-expression " 
-            << i << ", found " << std::distance(base, sub.first) 
+            << i << ", found " << boost::re_detail::distance(base, sub.first) 
             << ", expected " << answer_table[2*i] << ".", charT);
       }
-      if(std::distance(base, sub.second) != answer_table[1+ 2*i])
+      if(boost::re_detail::distance(base, sub.second) != answer_table[1+ 2*i])
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in end location of sub-expression " 
-            << i << ", found " << std::distance(base, sub.second) 
+            << i << ", found " << boost::re_detail::distance(base, sub.second) 
             << ", expected " << answer_table[1 + 2*i] << ".", charT);
       }
    }
@@ -238,21 +238,21 @@ void test_regex_token_iterator(boost::basic_regex<charT, traits>& r)
 #pragma warning(push)
 #pragma warning(disable:4244)
 #endif
-      if(std::distance(search_text.begin(), start2->first) != last_end2)
+      if(boost::re_detail::distance(search_text.begin(), start2->first) != last_end2)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of start of field split, found: " 
-            << std::distance(search_text.begin(), start2->first)
+            << boost::re_detail::distance(search_text.begin(), start2->first)
             << ", expected: "
             << last_end2
             << ".", charT);
       }
       int expected_end = static_cast<int>(answer_table[0] < 0 ? search_text.size() : answer_table[0]);
-      if(std::distance(search_text.begin(), start2->second) != expected_end)
+      if(boost::re_detail::distance(search_text.begin(), start2->second) != expected_end)
       {
          BOOST_REGEX_TEST_ERROR(
             "Error in location of end2 of field split, found: "
-            << std::distance(search_text.begin(), start2->second)
+            << boost::re_detail::distance(search_text.begin(), start2->second)
             << ", expected: "
             << expected_end
             << ".", charT);
diff --git a/test/regress/test_replace.cpp b/test/regress/test_replace.cpp
index efe712c6..e91b8ef6 100644
--- a/test/regress/test_replace.cpp
+++ b/test/regress/test_replace.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_sets.cpp b/test/regress/test_sets.cpp
index a60c3603..2496c934 100644
--- a/test/regress/test_sets.cpp
+++ b/test/regress/test_sets.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
index 8c8efee9..069c3e32 100644
--- a/test/regress/test_simple_repeats.cpp
+++ b/test/regress/test_simple_repeats.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_tricky_cases.cpp b/test/regress/test_tricky_cases.cpp
index cdcdb6f8..bad30f11 100644
--- a/test/regress/test_tricky_cases.cpp
+++ b/test/regress/test_tricky_cases.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/regress/test_unicode.cpp b/test/regress/test_unicode.cpp
index 1f4fe3d6..ddd07fd3 100644
--- a/test/regress/test_unicode.cpp
+++ b/test/regress/test_unicode.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/static_mutex/static_mutex_test.cpp b/test/static_mutex/static_mutex_test.cpp
index 2899ca4d..14c5379b 100644
--- a/test/static_mutex/static_mutex_test.cpp
+++ b/test/static_mutex/static_mutex_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
diff --git a/test/unicode/unicode_iterator_test.cpp b/test/unicode/unicode_iterator_test.cpp
index 1c16c464..792ae0b2 100644
--- a/test/unicode/unicode_iterator_test.cpp
+++ b/test/unicode/unicode_iterator_test.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file 
@@ -93,14 +93,18 @@ void test(const std::vector< ::boost::uint32_t>& v)
    v16.clear();
    std::copy(u32to16type(v.begin()), u32to16type(v.end()), std::back_inserter(v16));
 #endif
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(u32to16type(v.begin()), u32to16type(v.end())), v16.size());
+#endif
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
    v32.assign(u16to32type(v16.begin()), u16to32type(v16.end()));
 #else
    v32.clear();
    std::copy(u16to32type(v16.begin()), u16to32type(v16.end()), std::back_inserter(v32));
 #endif
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(u16to32type(v16.begin()), u16to32type(v16.end())), v32.size());
+#endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    i = v.begin();
    j = i;
@@ -115,10 +119,14 @@ void test(const std::vector< ::boost::uint32_t>& v)
    //
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
    v16.assign(ru32to16type(u32to16type(v.end())), ru32to16type(u32to16type(v.begin())));
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(ru32to16type(u32to16type(v.end())), ru32to16type(u32to16type(v.begin()))), v16.size());
+#endif
    std::reverse(v16.begin(), v16.end());
    v32.assign(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin())));
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin()))), v32.size());
+#endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    std::reverse(v32.begin(), v32.end());
    i = v.begin();
@@ -139,14 +147,18 @@ void test(const std::vector< ::boost::uint32_t>& v)
    v8.clear();
    std::copy(u32to8type(v.begin()), u32to8type(v.end()), std::back_inserter(v8));
 #endif
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(u32to8type(v.begin()), u32to8type(v.end())), v8.size());
+#endif
 #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
    v32.assign(u8to32type(v8.begin()), u8to32type(v8.end()));
 #else
    v32.clear();
    std::copy(u8to32type(v8.begin()), u8to32type(v8.end()), std::back_inserter(v32));
 #endif
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(u8to32type(v8.begin()), u8to32type(v8.end())), v32.size());
+#endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    i = v.begin();
    j = i;
@@ -161,10 +173,14 @@ void test(const std::vector< ::boost::uint32_t>& v)
    //
 #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
    v8.assign(ru32to8type(u32to8type(v.end())), ru32to8type(u32to8type(v.begin())));
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(ru32to8type(u32to8type(v.end())), ru32to8type(u32to8type(v.begin()))), v8.size());
+#endif
    std::reverse(v8.begin(), v8.end());
    v32.assign(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin())));
+#ifndef BOOST_NO_STD_DISTANCE
    BOOST_CHECK_EQUAL(std::distance(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin()))), v32.size());
+#endif
    BOOST_CHECK_EQUAL(v.size(), v32.size());
    std::reverse(v32.begin(), v32.end());
    i = v.begin();
diff --git a/tools/generate/tables.cpp b/tools/generate/tables.cpp
index e7db2e41..cd8f51ee 100644
--- a/tools/generate/tables.cpp
+++ b/tools/generate/tables.cpp
@@ -1,7 +1,7 @@
 /*
  *
  * Copyright (c) 2004
- * Dr John Maddock
+ * John Maddock
  *
  * Use, modification and distribution are subject to the 
  * Boost Software License, Version 1.0. (See accompanying file