diff --git a/mozilla/string/public/nsAWritableString.h b/mozilla/string/public/nsAWritableString.h
index 43b270043c7..fd22d3a8c50 100644
--- a/mozilla/string/public/nsAWritableString.h
+++ b/mozilla/string/public/nsAWritableString.h
@@ -17,15 +17,15 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsAWritableString_h__
 #define _nsAWritableString_h__
 
-  // WORK IN PROGRESS
-
   // See also...
 #include "nsAReadableString.h"
 
diff --git a/mozilla/string/public/nsCharTraits.h b/mozilla/string/public/nsCharTraits.h
index c5ee480dc72..6d7389b5428 100644
--- a/mozilla/string/public/nsCharTraits.h
+++ b/mozilla/string/public/nsCharTraits.h
@@ -17,8 +17,10 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsCharTraits_h__
diff --git a/mozilla/xpcom/ds/nsAWritableString.h b/mozilla/xpcom/ds/nsAWritableString.h
index 43b270043c7..fd22d3a8c50 100644
--- a/mozilla/xpcom/ds/nsAWritableString.h
+++ b/mozilla/xpcom/ds/nsAWritableString.h
@@ -17,15 +17,15 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsAWritableString_h__
 #define _nsAWritableString_h__
 
-  // WORK IN PROGRESS
-
   // See also...
 #include "nsAReadableString.h"
 
diff --git a/mozilla/xpcom/ds/nsCharTraits.h b/mozilla/xpcom/ds/nsCharTraits.h
index c5ee480dc72..6d7389b5428 100644
--- a/mozilla/xpcom/ds/nsCharTraits.h
+++ b/mozilla/xpcom/ds/nsCharTraits.h
@@ -17,8 +17,10 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsCharTraits_h__
diff --git a/mozilla/xpcom/string/public/nsAWritableString.h b/mozilla/xpcom/string/public/nsAWritableString.h
index 43b270043c7..fd22d3a8c50 100644
--- a/mozilla/xpcom/string/public/nsAWritableString.h
+++ b/mozilla/xpcom/string/public/nsAWritableString.h
@@ -17,15 +17,15 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsAWritableString_h__
 #define _nsAWritableString_h__
 
-  // WORK IN PROGRESS
-
   // See also...
 #include "nsAReadableString.h"
 
diff --git a/mozilla/xpcom/string/public/nsCharTraits.h b/mozilla/xpcom/string/public/nsCharTraits.h
index c5ee480dc72..6d7389b5428 100644
--- a/mozilla/xpcom/string/public/nsCharTraits.h
+++ b/mozilla/xpcom/string/public/nsCharTraits.h
@@ -17,8 +17,10 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsCharTraits_h__
diff --git a/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h b/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
index ff92b0ed221..4442b74a124 100644
--- a/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
+++ b/mozilla/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h
@@ -17,8 +17,10 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
+ * Original Author:
+ *   Scott Collins <scc@mozilla.org>
+ *
  * Contributor(s):
- *   Scott Collins <scc@netscape.com>
  */
 
 #ifndef _nsStdStringWrapper_h__