diff --git a/mozilla/editor/base/nsHTMLEditor.cpp b/mozilla/editor/base/nsHTMLEditor.cpp
index 9294586fe46..afc7b9ba13d 100644
--- a/mozilla/editor/base/nsHTMLEditor.cpp
+++ b/mozilla/editor/base/nsHTMLEditor.cpp
@@ -517,12 +517,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTML(const nsString& aInputString)
   return res;
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputText(nsString& aOutputString)
+NS_IMETHODIMP nsHTMLEditor::OutputTextToString(nsString& aOutputString)
 {
-  return nsTextEditor::OutputText(aOutputString);
+  return nsTextEditor::OutputTextToString(aOutputString);
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
+NS_IMETHODIMP nsHTMLEditor::OutputHTMLToString(nsString& aOutputString)
 {
 #if defined(DEBUG_kostello) || defined(DEBUG_akkana)
   nsCOMPtr<nsIHTMLEncoder> encoder;
@@ -535,18 +535,18 @@ NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
 
   return encoder->EncodeToString(aOutputString);
 #else
-  return nsTextEditor::OutputHTML(aOutputString);
+  return nsTextEditor::OutputHTMLToString(aOutputString);
 #endif
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
+NS_IMETHODIMP nsHTMLEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
 {
-  return nsTextEditor::OutputText(aOutputStream,aCharsetOverride);
+  return nsTextEditor::OutputTextToStream(aOutputStream,aCharsetOverride);
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
+NS_IMETHODIMP nsHTMLEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
 {
-  return nsTextEditor::OutputHTML(aOutputStream,aCharsetOverride);
+  return nsTextEditor::OutputHTMLToStream(aOutputStream,aCharsetOverride);
 }
 
 
diff --git a/mozilla/editor/base/nsHTMLEditor.h b/mozilla/editor/base/nsHTMLEditor.h
index 8260a07acb1..c28d2bf36bc 100644
--- a/mozilla/editor/base/nsHTMLEditor.h
+++ b/mozilla/editor/base/nsHTMLEditor.h
@@ -106,10 +106,10 @@ public:
   NS_IMETHOD BeginComposition(void);
   NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
   NS_IMETHOD EndComposition(void);
-  NS_IMETHOD OutputText(nsString& aOutputString);
-  NS_IMETHOD OutputHTML(nsString& aOutputString);
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
+  NS_IMETHOD OutputTextToString(nsString& aOutputString);
+  NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
+  NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
+  NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
 
 // End of methods implemented in nsEditor
 //=============================================================
diff --git a/mozilla/editor/base/nsTextEditor.cpp b/mozilla/editor/base/nsTextEditor.cpp
index 808b10ae1ec..870a7ac69db 100644
--- a/mozilla/editor/base/nsTextEditor.cpp
+++ b/mozilla/editor/base/nsTextEditor.cpp
@@ -1312,18 +1312,18 @@ NS_IMETHODIMP nsTextEditor::SetBodyWrapWidth(PRInt32 aWrapColumn)
   return res;
 }  
 
-NS_IMETHODIMP nsTextEditor::OutputText(nsString& aOutputString)
+NS_IMETHODIMP nsTextEditor::OutputTextToString(nsString& aOutputString)
 {
-  return OutputText(nsnull,&aOutputString,nsnull);
+  return OutputTextInternal(nsnull,&aOutputString,nsnull);
 }
 
-NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
+NS_IMETHODIMP nsTextEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
 {
-  return OutputText(aOutputStream,nsnull,aCharsetOverride);
+  return OutputTextInternal(aOutputStream,nsnull,aCharsetOverride);
 }
 
 
-NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
+NS_IMETHODIMP nsTextEditor::OutputTextInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
 { 
   nsresult rv = NS_ERROR_FAILURE;
 
@@ -1387,18 +1387,18 @@ NS_IMETHODIMP nsTextEditor::OutputText(nsIOutputStream* aOutputStream, nsString*
 }
 
 
-NS_IMETHODIMP nsTextEditor::OutputHTML(nsString& aOutputString)
+NS_IMETHODIMP nsTextEditor::OutputHTMLToString(nsString& aOutputString)
 {
-  return OutputHTML(nsnull,&aOutputString,nsnull);
+  return OutputHTMLInternal(nsnull,&aOutputString,nsnull);
 }
 
-NS_IMETHODIMP nsTextEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
+NS_IMETHODIMP nsTextEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
 {
-  return OutputHTML(aOutputStream,nsnull,aCharsetOverride);
+  return OutputHTMLInternal(aOutputStream,nsnull,aCharsetOverride);
 }
 
 
-NS_IMETHODIMP nsTextEditor::OutputHTML(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
+NS_IMETHODIMP nsTextEditor::OutputHTMLInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride)
 {
   
   nsresult rv = NS_ERROR_FAILURE;
diff --git a/mozilla/editor/base/nsTextEditor.h b/mozilla/editor/base/nsTextEditor.h
index 2942478d2e7..9dec3e3c36b 100644
--- a/mozilla/editor/base/nsTextEditor.h
+++ b/mozilla/editor/base/nsTextEditor.h
@@ -108,10 +108,10 @@ public:
   NS_IMETHOD BeginComposition(void);
   NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
   NS_IMETHOD EndComposition(void);
-  NS_IMETHOD OutputText(nsString& aOutputString);
-  NS_IMETHOD OutputHTML(nsString& aOutputString);
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
+  NS_IMETHOD OutputTextToString(nsString& aOutputString);
+  NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
+  NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
+  NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride);
 
 // Plain text wrapping control
   NS_IMETHOD GetBodyWrapWidth(PRInt32 *aWrapColumn);
@@ -258,8 +258,8 @@ protected:
   
 
   TypeInState *GetTypeInState(); 
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
+  NS_IMETHOD OutputTextInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
+  NS_IMETHOD OutputHTMLInternal(nsIOutputStream* aOutputStream, nsString* aOutputString, nsString* aCharsetOverride);
 
   /** simple utility to handle any error with event listener allocation or registration */
   void HandleEventListenerError();
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index 9294586fe46..afc7b9ba13d 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -517,12 +517,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTML(const nsString& aInputString)
   return res;
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputText(nsString& aOutputString)
+NS_IMETHODIMP nsHTMLEditor::OutputTextToString(nsString& aOutputString)
 {
-  return nsTextEditor::OutputText(aOutputString);
+  return nsTextEditor::OutputTextToString(aOutputString);
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
+NS_IMETHODIMP nsHTMLEditor::OutputHTMLToString(nsString& aOutputString)
 {
 #if defined(DEBUG_kostello) || defined(DEBUG_akkana)
   nsCOMPtr<nsIHTMLEncoder> encoder;
@@ -535,18 +535,18 @@ NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsString& aOutputString)
 
   return encoder->EncodeToString(aOutputString);
 #else
-  return nsTextEditor::OutputHTML(aOutputString);
+  return nsTextEditor::OutputHTMLToString(aOutputString);
 #endif
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
+NS_IMETHODIMP nsHTMLEditor::OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride)
 {
-  return nsTextEditor::OutputText(aOutputStream,aCharsetOverride);
+  return nsTextEditor::OutputTextToStream(aOutputStream,aCharsetOverride);
 }
 
-NS_IMETHODIMP nsHTMLEditor::OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
+NS_IMETHODIMP nsHTMLEditor::OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride)
 {
-  return nsTextEditor::OutputHTML(aOutputStream,aCharsetOverride);
+  return nsTextEditor::OutputHTMLToStream(aOutputStream,aCharsetOverride);
 }
 
 
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.h b/mozilla/editor/libeditor/html/nsHTMLEditor.h
index 8260a07acb1..c28d2bf36bc 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.h
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.h
@@ -106,10 +106,10 @@ public:
   NS_IMETHOD BeginComposition(void);
   NS_IMETHOD SetCompositionString(const nsString& aCompositionString);
   NS_IMETHOD EndComposition(void);
-  NS_IMETHOD OutputText(nsString& aOutputString);
-  NS_IMETHOD OutputHTML(nsString& aOutputString);
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
+  NS_IMETHOD OutputTextToString(nsString& aOutputString);
+  NS_IMETHOD OutputHTMLToString(nsString& aOutputString);
+  NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
+  NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream,nsString* aCharsetOverride = nsnull);
 
 // End of methods implemented in nsEditor
 //=============================================================
diff --git a/mozilla/editor/public/nsIHTMLEditor.h b/mozilla/editor/public/nsIHTMLEditor.h
index 1005b933b0c..b032116d1af 100644
--- a/mozilla/editor/public/nsIHTMLEditor.h
+++ b/mozilla/editor/public/nsIHTMLEditor.h
@@ -99,11 +99,11 @@ public:
 
   NS_IMETHOD InsertHTML(const nsString &aInputString)=0;
 
-  NS_IMETHOD OutputText(nsString& aOutputString)=0;
-  NS_IMETHOD OutputHTML(nsString& aOutputString)=0;
+  NS_IMETHOD OutputTextToString(nsString& aOutputString)=0;
+  NS_IMETHOD OutputHTMLToString(nsString& aOutputString)=0;
 
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
+  NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
+  NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
 
   NS_IMETHOD GetLocalFileURL(nsIDOMWindow* aParent, const nsString& aFilterType, nsString& aReturn)=0;
 
diff --git a/mozilla/editor/public/nsITextEditor.h b/mozilla/editor/public/nsITextEditor.h
index ce5bc83e2d9..105d65708c3 100644
--- a/mozilla/editor/public/nsITextEditor.h
+++ b/mozilla/editor/public/nsITextEditor.h
@@ -314,11 +314,11 @@ public:
   NS_IMETHOD ScrollIntoView(PRBool aScrollToBegin)=0;
 
 // Input/Output
-  NS_IMETHOD OutputText(nsString& aOutputString)=0;
-  NS_IMETHOD OutputHTML(nsString& aOutputString)=0;
+  NS_IMETHOD OutputTextToString(nsString& aOutputString)=0;
+  NS_IMETHOD OutputHTMLToString(nsString& aOutputString)=0;
   
-  NS_IMETHOD OutputText(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
-  NS_IMETHOD OutputHTML(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
+  NS_IMETHOD OutputTextToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
+  NS_IMETHOD OutputHTMLToStream(nsIOutputStream* aOutputStream, nsString* aCharsetOverride = nsnull)=0;
 
   /** Get and set the body wrap width
     * @param aWrapColumn - the column to wrap at. This is set as a COLS attribute