diff --git a/editor/base/nsEditorEventListeners.cpp b/editor/base/nsEditorEventListeners.cpp
index f5e5f9589415..a4379eea198b 100644
--- a/editor/base/nsEditorEventListeners.cpp
+++ b/editor/base/nsEditorEventListeners.cpp
@@ -1386,7 +1386,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
               if ( textDataObj )
               {
                 char* text = nsnull;
-                textDataObj->toString(&text);
+                textDataObj->ToString(&text);
                 nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
                 if ( htmlEditor && text )
                   htmlEditor->InsertText(text);
diff --git a/editor/base/nsHTMLEditor.cpp b/editor/base/nsHTMLEditor.cpp
index f51c1e5b9263..8d873747dc93 100644
--- a/editor/base/nsHTMLEditor.cpp
+++ b/editor/base/nsHTMLEditor.cpp
@@ -2804,7 +2804,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation()
       nsCOMPtr<nsISupportsWString> dataObj ( do_QueryInterface(genericDataObj) );
       if ( dataObj ) {
         PRUnichar* textData = nsnull;
-        dataObj->toString ( &textData );
+        dataObj->ToString ( &textData );
         nsAutoString text ( textData );
         rv = InsertAsPlaintextQuotation(text);
       }
@@ -3035,7 +3035,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
             if (textDataObj && len > 0)
             {
               PRUnichar* text = nsnull;
-              textDataObj->toString ( &text );
+              textDataObj->ToString ( &text );
               nsAutoString stuffToPaste;
               stuffToPaste.SetString ( text, len / 2 );
               rv = InsertHTML(stuffToPaste);
@@ -3047,7 +3047,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
             if (textDataObj && len > 0)
             {
               char* text = nsnull;
-              textDataObj->toString ( &text );
+              textDataObj->ToString ( &text );
               nsAutoString stuffToPaste;
               stuffToPaste.SetString ( text, len );
               rv = InsertText(stuffToPaste);
diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp
index f51c1e5b9263..8d873747dc93 100644
--- a/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/editor/libeditor/html/nsHTMLEditor.cpp
@@ -2804,7 +2804,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation()
       nsCOMPtr<nsISupportsWString> dataObj ( do_QueryInterface(genericDataObj) );
       if ( dataObj ) {
         PRUnichar* textData = nsnull;
-        dataObj->toString ( &textData );
+        dataObj->ToString ( &textData );
         nsAutoString text ( textData );
         rv = InsertAsPlaintextQuotation(text);
       }
@@ -3035,7 +3035,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
             if (textDataObj && len > 0)
             {
               PRUnichar* text = nsnull;
-              textDataObj->toString ( &text );
+              textDataObj->ToString ( &text );
               nsAutoString stuffToPaste;
               stuffToPaste.SetString ( text, len / 2 );
               rv = InsertHTML(stuffToPaste);
@@ -3047,7 +3047,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste()
             if (textDataObj && len > 0)
             {
               char* text = nsnull;
-              textDataObj->toString ( &text );
+              textDataObj->ToString ( &text );
               nsAutoString stuffToPaste;
               stuffToPaste.SetString ( text, len );
               rv = InsertText(stuffToPaste);
diff --git a/editor/libeditor/text/nsEditorEventListeners.cpp b/editor/libeditor/text/nsEditorEventListeners.cpp
index f5e5f9589415..a4379eea198b 100644
--- a/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -1386,7 +1386,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
               if ( textDataObj )
               {
                 char* text = nsnull;
-                textDataObj->toString(&text);
+                textDataObj->ToString(&text);
                 nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryInterface(mEditor);
                 if ( htmlEditor && text )
                   htmlEditor->InsertText(text);
diff --git a/widget/src/gtk/nsClipboard.cpp b/widget/src/gtk/nsClipboard.cpp
index d60de45b082a..227a47860b0e 100644
--- a/widget/src/gtk/nsClipboard.cpp
+++ b/widget/src/gtk/nsClipboard.cpp
@@ -291,7 +291,7 @@ NS_IMETHODIMP nsClipboard::SetNativeClipboardData()
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString(&flavorStr);
+      currentFlavor->ToString(&flavorStr);
       gint format = GetFormat(flavorStr);
 
       // add these types as selection targets
@@ -563,7 +563,7 @@ nsClipboard::GetNativeClipboardData(nsITransferable * aTransferable)
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString ( &flavorStr );
+      currentFlavor->ToString ( &flavorStr );
       gint format = GetFormat(flavorStr);
 
       if (DoConvert(format)) {
diff --git a/widget/src/mac/nsClipboard.cpp b/widget/src/mac/nsClipboard.cpp
index 85d9399b0432..819631546ec9 100644
--- a/widget/src/mac/nsClipboard.cpp
+++ b/widget/src/mac/nsClipboard.cpp
@@ -132,7 +132,7 @@ nsClipboard :: SetNativeClipboardData()
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString(&flavorStr);
+      currentFlavor->ToString(&flavorStr);
       
       // find MacOS flavor
       ResType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
@@ -212,7 +212,7 @@ nsClipboard :: GetNativeClipboardData(nsITransferable * aTransferable)
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString ( &flavorStr );
+      currentFlavor->ToString ( &flavorStr );
       
       // find MacOS flavor
       ResType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
diff --git a/widget/src/mac/nsDragService.cpp b/widget/src/mac/nsDragService.cpp
index f8992ff82b06..a97f4ef79a74 100644
--- a/widget/src/mac/nsDragService.cpp
+++ b/widget/src/mac/nsDragService.cpp
@@ -212,7 +212,7 @@ nsDragService :: RegisterDragItemsAndFlavors ( nsISupportsArray * inArray )
           nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericWrapper) );
 	      if ( currentFlavor ) {
 	        char* flavorStr = nsnull;
-	        currentFlavor->toString ( &flavorStr );
+	        currentFlavor->ToString ( &flavorStr );
 	        FlavorType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
 	        ::AddDragItemFlavor ( mDragRef, itemIndex, macOSFlavor, NULL, 0, flags );
 	        delete [] flavorStr;
@@ -282,7 +282,7 @@ nsDragService :: GetData ( nsITransferable * aTransferable, PRUint32 aItemIndex
     if ( currentFlavor ) {
       // find MacOS flavor
       char* flavorStr;
-      currentFlavor->toString ( &flavorStr );
+      currentFlavor->ToString ( &flavorStr );
       FlavorType macOSFlavor = theMapper.MapMimeTypeToMacOSType(flavorStr);
 printf("looking for data in type %s, mac flavor %ld\n", flavorStr, macOSFlavor);
 	    
diff --git a/widget/src/windows/nsClipboard.cpp b/widget/src/windows/nsClipboard.cpp
index 32d4e20581ff..c23f5727cafe 100644
--- a/widget/src/windows/nsClipboard.cpp
+++ b/widget/src/windows/nsClipboard.cpp
@@ -147,7 +147,7 @@ nsresult nsClipboard::SetupNativeDataObject(nsITransferable * aTransferable, IDa
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString(&flavorStr);
+      currentFlavor->ToString(&flavorStr);
       UINT format = GetFormat(flavorStr);
 
       // check here to see if we can the data back from global member
@@ -538,7 +538,7 @@ nsresult nsClipboard::GetDataFromDataObject(IDataObject     * aDataObject,
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString(&flavorStr);
+      currentFlavor->ToString(&flavorStr);
       UINT format = GetFormat(flavorStr);
 
       void   * data;
@@ -651,7 +651,7 @@ NS_IMETHODIMP nsClipboard::ForceDataToClipboard()
     nsCOMPtr<nsISupportsString> currentFlavor ( do_QueryInterface(genericFlavor) );
     if ( currentFlavor ) {
       char* flavorStr;
-      currentFlavor->toString(&flavorStr);
+      currentFlavor->ToString(&flavorStr);
       UINT format = GetFormat(flavorStr);
 
       void   * data;
diff --git a/widget/src/xpwidgets/nsXIFFormatConverter.cpp b/widget/src/xpwidgets/nsXIFFormatConverter.cpp
index fd246ccbf95c..646607a946dd 100644
--- a/widget/src/xpwidgets/nsXIFFormatConverter.cpp
+++ b/widget/src/xpwidgets/nsXIFFormatConverter.cpp
@@ -220,7 +220,7 @@ nsXIFFormatConverter::Convert(const char *aFromDataFlavor, nsISupports *aFromDat
     nsCOMPtr<nsISupportsWString> dataWrapper ( do_QueryInterface(aFromData) );
     if ( dataWrapper ) {
       PRUnichar* data = nsnull;
-      dataWrapper->toString ( &data );
+      dataWrapper->ToString ( &data );
       if ( data ) {
         nsAutoString dataStr ( data );
         nsAutoString outStr;