diff --git a/mozilla/dom/src/base/nsDOMException.cpp b/mozilla/dom/src/base/nsDOMException.cpp
index 5fb3115cd92..80e63f70d91 100644
--- a/mozilla/dom/src/base/nsDOMException.cpp
+++ b/mozilla/dom/src/base/nsDOMException.cpp
@@ -232,7 +232,7 @@ nsBaseDOMException::~nsBaseDOMException()
 NS_IMPL_ISUPPORTS2(nsBaseDOMException, nsIException, nsIBaseDOMException)
 
 NS_IMETHODIMP
-nsBaseDOMException::GetMessage(char **aMessage)
+nsBaseDOMException::GetMessageMoz(char **aMessage)
 {
   if (mMessage) {
     *aMessage = NS_strdup(mMessage);
diff --git a/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp b/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
index d7ad532cf8c..7a88ba243db 100644
--- a/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
+++ b/mozilla/js/src/xpconnect/src/XPCDispTearOff.cpp
@@ -96,7 +96,7 @@ HRESULT Error(HRESULT hResult, const char * message)
 static void BuildMessage(nsIException * exception, nsCString & result)
 {
     nsXPIDLCString msg;
-    exception->GetMessage(getter_Copies(msg));
+    exception->GetMessageMoz(getter_Copies(msg));
     nsXPIDLCString filename;
     exception->GetFilename(getter_Copies(filename));
 
diff --git a/mozilla/js/src/xpconnect/src/nsScriptError.cpp b/mozilla/js/src/xpconnect/src/nsScriptError.cpp
index 18ae72c1b39..ab40c795da9 100644
--- a/mozilla/js/src/xpconnect/src/nsScriptError.cpp
+++ b/mozilla/js/src/xpconnect/src/nsScriptError.cpp
@@ -61,7 +61,7 @@ nsScriptError::~nsScriptError() {}
 
 // nsIConsoleMessage methods
 NS_IMETHODIMP
-nsScriptError::GetMessage(PRUnichar **result) {
+nsScriptError::GetMessageMoz(PRUnichar **result) {
     nsresult rv;
 
     nsCAutoString message;
diff --git a/mozilla/js/src/xpconnect/src/xpcconvert.cpp b/mozilla/js/src/xpconnect/src/xpcconvert.cpp
index e8a68ea9bc5..8e6ddec6ee4 100644
--- a/mozilla/js/src/xpconnect/src/xpcconvert.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcconvert.cpp
@@ -1329,7 +1329,7 @@ XPCConvert::ConstructException(nsresult rv, const char* message,
 
     nsCOMPtr<nsIScriptError> errorObject = do_QueryInterface(data);
     if(errorObject) {
-        if (NS_SUCCEEDED(errorObject->GetMessage(getter_Copies(xmsg)))) {
+        if (NS_SUCCEEDED(errorObject->GetMessageMoz(getter_Copies(xmsg)))) {
             CopyUTF16toUTF8(xmsg, sxmsg);
             msg = sxmsg.get();
         }
diff --git a/mozilla/js/src/xpconnect/src/xpcexception.cpp b/mozilla/js/src/xpconnect/src/xpcexception.cpp
index dab5b42639c..724a4e689bc 100644
--- a/mozilla/js/src/xpconnect/src/xpcexception.cpp
+++ b/mozilla/js/src/xpconnect/src/xpcexception.cpp
@@ -176,7 +176,7 @@ nsXPCException::Reset()
 
 /* readonly attribute string message; */
 NS_IMETHODIMP
-nsXPCException::GetMessage(char * *aMessage)
+nsXPCException::GetMessageMoz(char * *aMessage)
 {
     if(!mInitialized)
         return NS_ERROR_NOT_INITIALIZED;
diff --git a/mozilla/js/src/xpconnect/src/xpcprivate.h b/mozilla/js/src/xpconnect/src/xpcprivate.h
index b6ee2fad9d9..d1a3f04ff0d 100644
--- a/mozilla/js/src/xpconnect/src/xpcprivate.h
+++ b/mozilla/js/src/xpconnect/src/xpcprivate.h
@@ -139,7 +139,6 @@
 // Nasty MS defines
 #undef GetClassInfo
 #undef GetClassName
-#undef GetMessage
 #endif
 
 /***************************************************************************/
diff --git a/mozilla/toolkit/xre/nsConsoleWriter.cpp b/mozilla/toolkit/xre/nsConsoleWriter.cpp
index bc724dfa1cb..e4a85de363a 100644
--- a/mozilla/toolkit/xre/nsConsoleWriter.cpp
+++ b/mozilla/toolkit/xre/nsConsoleWriter.cpp
@@ -115,7 +115,7 @@ WriteConsoleLog()
   nsCAutoString nativemsg;
 
   for (PRUint32 i = 0; i < mcount; ++i) {
-    rv = messages[i]->GetMessage(getter_Copies(msg));
+    rv = messages[i]->GetMessageMoz(getter_Copies(msg));
     if (NS_SUCCEEDED(rv)) {
       NS_CopyUnicodeToNative(msg, nativemsg);
       PR_fprintf(file, "%s" NS_LINEBREAK, nativemsg.get());
diff --git a/mozilla/xpcom/base/nsConsoleMessage.cpp b/mozilla/xpcom/base/nsConsoleMessage.cpp
index 02dc589b80a..cd072cbea03 100644
--- a/mozilla/xpcom/base/nsConsoleMessage.cpp
+++ b/mozilla/xpcom/base/nsConsoleMessage.cpp
@@ -54,7 +54,7 @@ nsConsoleMessage::nsConsoleMessage(const PRUnichar *message)
 }
 
 NS_IMETHODIMP
-nsConsoleMessage::GetMessage(PRUnichar **result) {
+nsConsoleMessage::GetMessageMoz(PRUnichar **result) {
     *result = ToNewUnicode(mMessage);
 
     return NS_OK;
diff --git a/mozilla/xpcom/base/nsIConsoleMessage.idl b/mozilla/xpcom/base/nsIConsoleMessage.idl
index 0662a2d22c6..9ca8b7a71a6 100644
--- a/mozilla/xpcom/base/nsIConsoleMessage.idl
+++ b/mozilla/xpcom/base/nsIConsoleMessage.idl
@@ -45,7 +45,7 @@
 [scriptable, uuid(41bd8784-1dd2-11b2-9553-8606958fffe1)]
 interface nsIConsoleMessage : nsISupports
 {
-    readonly attribute wstring message;
+    [binaryname(MessageMoz)] readonly attribute wstring message;
 };
 
 %{ C++
diff --git a/mozilla/xpcom/base/nsIException.idl b/mozilla/xpcom/base/nsIException.idl
index affbb36e932..9f319d0203b 100644
--- a/mozilla/xpcom/base/nsIException.idl
+++ b/mozilla/xpcom/base/nsIException.idl
@@ -67,7 +67,7 @@ interface nsIStackFrame : nsISupports
 interface nsIException : nsISupports
 {
     // A custom message set by the thrower.
-    readonly attribute string                  message;
+    [binaryname(MessageMoz)] readonly attribute string message;
     // The nsresult associated with this exception.
     readonly attribute nsresult                result;
     // The name of the error code (ie, a string repr of |result|)