diff --git a/mozilla/base/public/nsIFileStream.h b/mozilla/base/public/nsIFileStream.h
index 7611b73c060..22198534ede 100644
--- a/mozilla/base/public/nsIFileStream.h
+++ b/mozilla/base/public/nsIFileStream.h
@@ -36,7 +36,7 @@ class nsIFile
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILE_IID; return iid; }
 	NS_IMETHOD                         Open(
                                            const nsFileSpec& inFile,
                                            int nsprMode,
@@ -67,7 +67,7 @@ class nsIFileInputStream
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
 }; // class nsIFileInputStream
 
 /* a6cf90e7-15b3-11d2-932e-00805f8add32 */
@@ -84,7 +84,7 @@ class nsIFileOutputStream
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
     NS_IMETHOD                         Flush() = 0;
                                            // Forces a write to disk.
 }; // class nsIFileOutputStream
diff --git a/mozilla/base/src/nsIAtom.h b/mozilla/base/src/nsIAtom.h
index 0c52aea1b4d..f3fc836ef30 100644
--- a/mozilla/base/src/nsIAtom.h
+++ b/mozilla/base/src/nsIAtom.h
@@ -35,7 +35,7 @@ class nsISizeOfHandler;
  */
 class nsIAtom : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IATOM_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IATOM_IID; return iid; }
 
   /**
    * Translate the unicode string into the stringbuf.
diff --git a/mozilla/base/src/nsIBaseStream.h b/mozilla/base/src/nsIBaseStream.h
index a360cfee093..ffef4d25c15 100644
--- a/mozilla/base/src/nsIBaseStream.h
+++ b/mozilla/base/src/nsIBaseStream.h
@@ -31,7 +31,7 @@
 class nsIBaseStream : public nsISupports {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
 
     /** Close the stream. */
     NS_IMETHOD
diff --git a/mozilla/base/src/nsIFileStream.cpp b/mozilla/base/src/nsIFileStream.cpp
index 89cca04cd0a..13bc8191ab7 100644
--- a/mozilla/base/src/nsIFileStream.cpp
+++ b/mozilla/base/src/nsIFileStream.cpp
@@ -162,7 +162,7 @@ class FileImpl
 }; // class FileImpl
 
 #define SAY_I_IMPLEMENT(classname)        \
-  if (aIID.Equals(classname::IID()))                  \
+  if (aIID.Equals(classname::GetIID()))        \
   {                                            \
       *aInstancePtr = (void*)((classname*)this); \
       NS_ADDREF_THIS();                        \
@@ -190,13 +190,13 @@ NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   // of nsISupports), one through
   // nsIOutputStream, the other through nsIInputStream.  Resolve this
   // by giving them a specific one
-  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
       return NS_OK;
   }
-  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
diff --git a/mozilla/base/src/nsIInputStream.h b/mozilla/base/src/nsIInputStream.h
index 67dac59561b..055bb2658fd 100644
--- a/mozilla/base/src/nsIInputStream.h
+++ b/mozilla/base/src/nsIInputStream.h
@@ -28,7 +28,7 @@
 class nsIInputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
 
     /** Return the number of bytes in the stream
      *  @param aLength out parameter to hold the length
diff --git a/mozilla/base/src/nsIOutputStream.h b/mozilla/base/src/nsIOutputStream.h
index aa7d447b2ee..659c54a3eda 100644
--- a/mozilla/base/src/nsIOutputStream.h
+++ b/mozilla/base/src/nsIOutputStream.h
@@ -29,7 +29,7 @@
 class nsIOutputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
 
     /** Write data into the stream.
      *  @param aBuf the buffer into which the data is read
diff --git a/mozilla/build/mac/IDE_Options.h b/mozilla/build/mac/IDE_Options.h
index dc871a9abbe..fa1bf98053e 100644
--- a/mozilla/build/mac/IDE_Options.h
+++ b/mozilla/build/mac/IDE_Options.h
@@ -41,7 +41,7 @@
 #pragma unsigned_char			off
 #pragma exceptions				on
 #pragma bool 					on
-#pragma RTTI                off
+#pragma RTTI                on
 
 
 	/* Save as much space as possible with strings... */
@@ -71,6 +71,14 @@
 		#pragma scheduling 			604
 		#pragma peephole 			on
 		#pragma optimize_for_size	on
+
+    #pragma opt_strength_reduction on
+    #pragma opt_propagation on
+    #pragma opt_loop_invariants on
+    #pragma opt_lifetimes on
+    #pragma opt_dead_code on
+    #pragma opt_dead_assignments on
+    #pragma opt_common_subs on
 	#endif
 
 #else /* ...generating 68k */
diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index bb140626cd3..b6714a6dc1f 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -47,7 +47,7 @@ class nsIDOMRange;
 // is supported by all content objects.
 class nsIContent : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
 
   NS_IMETHOD GetDocument(nsIDocument*& aResult) const = 0;
 
diff --git a/mozilla/content/base/public/nsIContentIterator.h b/mozilla/content/base/public/nsIContentIterator.h
index 5e1740b7040..a074e5aac27 100644
--- a/mozilla/content/base/public/nsIContentIterator.h
+++ b/mozilla/content/base/public/nsIContentIterator.h
@@ -31,7 +31,7 @@ class nsIDOMRange;
 class nsIContentIterator : public nsISupports {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ICONTENTITERTOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENTITERTOR_IID; return iid; }
 
   /* Initializes an iterator for the subtree rooted by the node aRoot
    */
diff --git a/mozilla/content/base/public/nsIStyleRule.h b/mozilla/content/base/public/nsIStyleRule.h
index cbb016daa43..af538ce969d 100644
--- a/mozilla/content/base/public/nsIStyleRule.h
+++ b/mozilla/content/base/public/nsIStyleRule.h
@@ -34,7 +34,7 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
 
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
diff --git a/mozilla/content/base/public/nsIStyledContent.h b/mozilla/content/base/public/nsIStyledContent.h
index fb3275385af..5521845f384 100644
--- a/mozilla/content/base/public/nsIStyledContent.h
+++ b/mozilla/content/base/public/nsIStyledContent.h
@@ -32,7 +32,7 @@ class nsIStyleContext;
 // the ability to specify style hints on an attribute change).
 class nsIStyledContent : public nsIContent {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLEDCONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLEDCONTENT_IID; return iid; }
 
   NS_IMETHOD GetID(nsIAtom*& aResult) const = 0;
   NS_IMETHOD GetClasses(nsVoidArray& aArray) const = 0;
diff --git a/mozilla/content/base/src/nsContentIterator.cpp b/mozilla/content/base/src/nsContentIterator.cpp
index be458693fd8..ff28ee787aa 100644
--- a/mozilla/content/base/src/nsContentIterator.cpp
+++ b/mozilla/content/base/src/nsContentIterator.cpp
@@ -105,7 +105,7 @@ nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult);
 nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult)
 {
   nsContentIterator * iter = new nsContentIterator();
-  return iter->QueryInterface(nsIContentIterator::IID(), (void**) aInstancePtrResult);
+  return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
 }
 
 
@@ -130,13 +130,13 @@ nsresult nsContentIterator::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-/*  if (aIID.Equals(nsIEnumerator::IID())) 
+/*  if (aIID.Equals(nsIEnumerator::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIEnumerator*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }  */
-  if (aIID.Equals(nsIContentIterator::IID())) 
+  if (aIID.Equals(nsIContentIterator::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIContentIterator*)this;
     NS_ADDREF_THIS();
@@ -528,7 +528,7 @@ nsresult nsContentIterator::CurrentNode(nsIContent **aNode)
     return NS_ERROR_FAILURE;
   if (mIsDone) 
     return NS_ERROR_FAILURE;
-  return mCurNode->QueryInterface(nsIContent::IID(), (void**) aNode);
+  return mCurNode->QueryInterface(nsIContent::GetIID(), (void**) aNode);
 }
 
 
@@ -591,7 +591,7 @@ nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult);
 nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult)
 {
   nsContentIterator * iter = new nsContentSubtreeIterator();
-  return iter->QueryInterface(nsIContentIterator::IID(), (void**) aInstancePtrResult);
+  return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
 }
 
 
diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp
index f417844c16b..53220309d75 100644
--- a/mozilla/content/base/src/nsRange.cpp
+++ b/mozilla/content/base/src/nsRange.cpp
@@ -49,7 +49,7 @@ nsresult
 NS_NewRange(nsIDOMRange** aInstancePtrResult)
 {
   nsRange * range = new nsRange();
-  return range->QueryInterface(nsIDOMRange::IID(), (void**) aInstancePtrResult);
+  return range->QueryInterface(nsIDOMRange::GetIID(), (void**) aInstancePtrResult);
 }
 
 
@@ -280,7 +280,7 @@ nsresult nsRange::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsIDOMRange::IID())) 
+  if (aIID.Equals(nsIDOMRange::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIDOMRange*)this;
     NS_ADDREF_THIS();
@@ -328,7 +328,7 @@ nsresult nsRange::AddToListOf(nsCOMPtr<nsIDOMNode> aNode)
   
   nsCOMPtr<nsIContent> cN;
 
-  nsresult res = aNode->QueryInterface(nsIContent::IID(), getter_AddRefs(cN));
+  nsresult res = aNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cN));
   if (!NS_SUCCEEDED(res)) 
     return res;
 
@@ -344,7 +344,7 @@ nsresult nsRange::RemoveFromListOf(nsCOMPtr<nsIDOMNode> aNode)
   
   nsCOMPtr<nsIContent> cN;
 
-  nsresult res = aNode->QueryInterface(nsIContent::IID(), getter_AddRefs(cN));
+  nsresult res = aNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cN));
   if (!NS_SUCCEEDED(res)) 
     return res;
 
@@ -564,11 +564,11 @@ PRInt32 nsRange::IndexOf(nsCOMPtr<nsIDOMNode> aChildNode)
     return 0;
   
   // convert node and parent to nsIContent, so that we can find the child index
-  res = parentNode->QueryInterface(nsIContent::IID(), getter_AddRefs(contentParent));
+  res = parentNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(contentParent));
   if (!NS_SUCCEEDED(res)) 
     return 0;
 
-  res = aChildNode->QueryInterface(nsIContent::IID(), getter_AddRefs(contentChild));
+  res = aChildNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(contentChild));
   if (!NS_SUCCEEDED(res)) 
     return 0;
   
@@ -615,7 +615,7 @@ PRInt32 nsRange::GetAncestorsAndOffsets(nsCOMPtr<nsIDOMNode> aNode, PRInt32 aOff
   
   // callers responsibility to make sure args are non-null and proper type
 
-  res = aNode->QueryInterface(nsIContent::IID(),getter_AddRefs(contentNode));
+  res = aNode->QueryInterface(nsIContent::GetIID(),getter_AddRefs(contentNode));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::GetAncestorsAndOffsets");
@@ -714,7 +714,7 @@ nsCOMPtr<nsIDOMNode> nsRange::CommonParent(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr
   // or the first common ancestor from the leaf perspective
   i++;
   nsIDOMNode *node = NS_STATIC_CAST(nsIDOMNode*, array1->ElementAt(i));
-  node->QueryInterface(nsIDOMNode::IID(), getter_AddRefs(theParent));
+  node->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(theParent));
   return theParent;  
 }
 
@@ -722,7 +722,7 @@ nsresult nsRange::GetDOMNodeFromContent(nsCOMPtr<nsIContent> inContentNode, nsCO
 {
   if (!outDomNode) 
     return NS_ERROR_NULL_POINTER;
-  nsresult res = inContentNode->QueryInterface(nsIDOMNode::IID(), getter_AddRefs(*outDomNode));
+  nsresult res = inContentNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(*outDomNode));
   if (!NS_SUCCEEDED(res)) 
     return res;
   return NS_OK;
@@ -732,7 +732,7 @@ nsresult nsRange::GetContentFromDOMNode(nsCOMPtr<nsIDOMNode> inDomNode, nsCOMPtr
 {
   if (!outContentNode) 
     return NS_ERROR_NULL_POINTER;
-  nsresult res = inDomNode->QueryInterface(nsIContent::IID(), getter_AddRefs(*outContentNode));
+  nsresult res = inDomNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(*outContentNode));
   if (!NS_SUCCEEDED(res)) 
     return res;
   return NS_OK;
@@ -1018,13 +1018,13 @@ nsresult nsRange::DeleteContents()
   nsCOMPtr<nsIContent> cEnd;
   
   // get the content versions of our endpoints
-  nsresult res = mStartParent->QueryInterface(nsIContent::IID(), getter_AddRefs(cStart));
+  nsresult res = mStartParent->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cStart));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::DeleteContents");
     return NS_ERROR_UNEXPECTED;
   }
-  res = mEndParent->QueryInterface(nsIContent::IID(), getter_AddRefs(cEnd));
+  res = mEndParent->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cEnd));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::DeleteContents");
@@ -1059,7 +1059,7 @@ nsresult nsRange::DeleteContents()
     else // textnode -  offsets refer to data in node
     {
       nsCOMPtr<nsIDOMText> textNode;
-      res = mStartParent->QueryInterface(nsIDOMText::IID(), getter_AddRefs(textNode));
+      res = mStartParent->QueryInterface(nsIDOMText::GetIID(), getter_AddRefs(textNode));
       if (!NS_SUCCEEDED(res)) // if it's not a text node, punt
       {
         NS_NOTREACHED("nsRange::DeleteContents");
@@ -1130,7 +1130,7 @@ nsresult nsRange::DeleteContents()
   
   // If mStartParent is a text node, delete the text after start offset
   nsIDOMText *textNode;
-  res = mStartParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+  res = mStartParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
   if (NS_SUCCEEDED(res)) 
   {
     res = textNode->DeleteData(mStartOffset, 0xFFFFFFFF); // del to end
@@ -1139,7 +1139,7 @@ nsresult nsRange::DeleteContents()
   }
 
   // If mEndParent is a text node, delete the text before end offset
-  res = mEndParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+  res = mEndParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
   if (NS_SUCCEEDED(res)) 
   {
     res = textNode->DeleteData(0, mEndOffset); // del from start
@@ -1400,13 +1400,13 @@ nsresult nsRange::ToString(nsString& aReturn)
   aReturn.Truncate();
   
   // get the content versions of our endpoints
-  nsresult res = mStartParent->QueryInterface(nsIContent::IID(), (void**)&cStart);
+  nsresult res = mStartParent->QueryInterface(nsIContent::GetIID(), (void**)&cStart);
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::ToString");
     return NS_ERROR_UNEXPECTED;
   }
-  res = mEndParent->QueryInterface(nsIContent::IID(), (void**)&cEnd);
+  res = mEndParent->QueryInterface(nsIContent::GetIID(), (void**)&cEnd);
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::ToString");
@@ -1418,7 +1418,7 @@ nsresult nsRange::ToString(nsString& aReturn)
   if (cStart == cEnd)
   {
     nsIDOMText *textNode;
-    res = mStartParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+    res = mStartParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
     if (!NS_SUCCEEDED(res)) // if it's not a text node, skip to iterator approach
     {
        goto toStringComplexLabel;
@@ -1455,7 +1455,7 @@ toStringComplexLabel:
   while (NS_COMFALSE == iter->IsDone())
   {
     nsIDOMText *textNode;
-    res = cN->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+    res = cN->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
     if (NS_SUCCEEDED(res)) // if it's a text node, get the text
     {
       if (cN == cStart) // only include text past start offset
diff --git a/mozilla/content/html/content/public/nsIHTMLContent.h b/mozilla/content/html/content/public/nsIHTMLContent.h
index 5c150ecb244..936780f9251 100644
--- a/mozilla/content/html/content/public/nsIHTMLContent.h
+++ b/mozilla/content/html/content/public/nsIHTMLContent.h
@@ -41,7 +41,7 @@ typedef void (*nsMapAttributesFunc)(nsIHTMLAttributes* aAttributes,
 // Abstract interface for all html content
 class nsIHTMLContent : public nsIStyledContent {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
 
   /**
    * If this html content is a container, then compact asks it to minimize
diff --git a/mozilla/content/html/style/public/nsICSSStyleSheet.h b/mozilla/content/html/style/public/nsICSSStyleSheet.h
index fef9f059b4e..d982be1408b 100644
--- a/mozilla/content/html/style/public/nsICSSStyleSheet.h
+++ b/mozilla/content/html/style/public/nsICSSStyleSheet.h
@@ -30,7 +30,7 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
 
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
diff --git a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
index c2bea3685b0..709d82e0512 100644
--- a/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleSheet.cpp
@@ -1027,7 +1027,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
         ((nsnull != aSelector->mID) || (nsnull != aSelector->mClassList))) {  // test for ID & class match
       result = PR_FALSE;
       nsIStyledContent* styledContent;
-      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
         nsIAtom* contentID;
         styledContent->GetID(contentID);
         if ((nsnull == aSelector->mID) || (aSelector->mID == contentID)) {
@@ -1322,7 +1322,7 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
     nsVoidArray classArray; // XXX need to recycle this guy (or make nsAutoVoidArray?)
 
     nsIStyledContent* styledContent;
-    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
       styledContent->GetID(idAtom);
       styledContent->GetClasses(classArray);
       NS_RELEASE(styledContent);
diff --git a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
index 46b08ebcf3d..fba833e463e 100644
--- a/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -191,7 +191,7 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   nsIStyledContent* styledContent;
 
   // just get the one and only style rule from the content's STYLE attribute
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     nsIStyleRule* rule = nsnull;
     if (NS_SUCCEEDED(styledContent->GetInlineStyleRule(rule))) {
       if (nsnull != rule) {
diff --git a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
index f96f24ccd51..aaaf8bb46e3 100644
--- a/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/content/html/style/src/nsHTMLStyleSheet.cpp
@@ -412,7 +412,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   PRInt32 matchCount = 0;
 
   nsIStyledContent* styledContent;
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     PRInt32 nameSpace;
     styledContent->GetNameSpaceID(nameSpace);
     if (kNameSpaceID_HTML == nameSpace) {
diff --git a/mozilla/content/html/style/src/nsICSSStyleRule.h b/mozilla/content/html/style/src/nsICSSStyleRule.h
index 51060172dc7..4d9a4adeb81 100644
--- a/mozilla/content/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/content/html/style/src/nsICSSStyleRule.h
@@ -102,7 +102,7 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
 
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
diff --git a/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp b/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
index 63d6902d926..4c330ba1173 100644
--- a/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
+++ b/mozilla/content/xul/content/src/nsRDFDOMNodeList.cpp
@@ -96,7 +96,7 @@ RDFHTMLCollectionImpl::QueryInterface(REFNSIID aIID, void** aResult)
     if (! aResult)
         return NS_ERROR_NULL_POINTER;
 
-    if (aIID.Equals(nsIDOMHTMLCollection::IID())) {
+    if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMHTMLCollection*, this);
         NS_ADDREF(this);
         return NS_OK;
@@ -186,7 +186,7 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
     if (! aResult)
         return NS_ERROR_NULL_POINTER;
 
-    if (aIID.Equals(nsIDOMNodeList::IID()) ||
+    if (aIID.Equals(nsIDOMNodeList::GetIID()) ||
         aIID.Equals(kISupportsIID)) {
         *aResult = NS_STATIC_CAST(nsIDOMNodeList*, this);
         NS_ADDREF(this);
@@ -197,7 +197,7 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
         NS_ADDREF(this);
         return NS_OK;
     }
-    else if (aIID.Equals(nsIDOMHTMLCollection::IID())) {
+    else if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
         // Aggregate this interface
         if (! mInner) {
             if (! (mInner = new RDFHTMLCollectionImpl(this)))
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index 43f1d7075d1..9e4f4bcfa4d 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -401,7 +401,7 @@ RDFElementImpl::QueryInterface(REFNSIID iid, void** result)
         iid.Equals(kISupportsIID)) {
         *result = NS_STATIC_CAST(nsIContent*, this);
     }
-    else if (iid.Equals(nsIDOMXULElement::IID()) ||
+    else if (iid.Equals(nsIDOMXULElement::GetIID()) ||
              iid.Equals(kIDOMElementIID) ||
              iid.Equals(kIDOMNodeIID)) {
         *result = NS_STATIC_CAST(nsIDOMElement*, this);
@@ -626,7 +626,7 @@ NS_IMETHODIMP
 RDFElementImpl::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 {
     if (mDocument) {
-        return mDocument->QueryInterface(nsIDOMDocument::IID(), (void**) aOwnerDocument);
+        return mDocument->QueryInterface(nsIDOMDocument::GetIID(), (void**) aOwnerDocument);
     }
     else {
         *aOwnerDocument = nsnull;
@@ -643,7 +643,7 @@ RDFElementImpl::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnInsertBefore(this, aNewChild, aRefChild);
         NS_RELEASE(obs);
     }
@@ -661,7 +661,7 @@ RDFElementImpl::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnReplaceChild(this, aNewChild, aOldChild);
         NS_RELEASE(obs);
     }
@@ -679,7 +679,7 @@ RDFElementImpl::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveChild(this, aOldChild);
         NS_RELEASE(obs);
     }
@@ -697,7 +697,7 @@ RDFElementImpl::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnAppendChild(this, aNewChild);
         NS_RELEASE(obs);
     }
@@ -762,7 +762,7 @@ NS_IMETHODIMP
 RDFElementImpl::SetAttribute(const nsString& aName, const nsString& aValue)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttribute(this, aName, aValue);
         NS_RELEASE(obs);
     }
@@ -774,7 +774,7 @@ NS_IMETHODIMP
 RDFElementImpl::RemoveAttribute(const nsString& aName)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttribute(this, aName);
         NS_RELEASE(obs);
     }
@@ -798,7 +798,7 @@ RDFElementImpl::SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttributeNode(this, aNewAttr);
         NS_RELEASE(obs);
     }
@@ -816,7 +816,7 @@ RDFElementImpl::RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttributeNode(this, aOldAttr);
         NS_RELEASE(obs);
     }
@@ -837,7 +837,7 @@ RDFElementImpl::GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aRe
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByTagName(domElement, aName, elements);
         NS_RELEASE(domElement);
     }
@@ -859,7 +859,7 @@ RDFElementImpl::GetElementsByAttribute(const nsString& aAttribute,
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByAttribute(domElement, aAttribute, aValue, elements);
         NS_RELEASE(domElement);
     }
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index 534c1516101..74ea58c7dee 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -728,9 +728,9 @@ XULDocumentImpl::QueryInterface(REFNSIID iid, void** result)
              iid.Equals(kIXMLDocumentIID)) {
         *result = NS_STATIC_CAST(nsIRDFDocument*, this);
     }
-    else if (iid.Equals(nsIDOMXULDocument::IID()) ||
-             iid.Equals(nsIDOMDocument::IID()) ||
-             iid.Equals(nsIDOMNode::IID())) {
+    else if (iid.Equals(nsIDOMXULDocument::GetIID()) ||
+             iid.Equals(nsIDOMDocument::GetIID()) ||
+             iid.Equals(nsIDOMNode::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMXULDocument*, this);
     }
     else if (iid.Equals(kIJSScriptObjectIID)) {
@@ -742,10 +742,10 @@ XULDocumentImpl::QueryInterface(REFNSIID iid, void** result)
     else if (iid.Equals(kIHTMLContentContainerIID)) {
         *result = NS_STATIC_CAST(nsIHTMLContentContainer*, this);
     }
-    else if (iid.Equals(nsIDOMNodeObserver::IID())) {
+    else if (iid.Equals(nsIDOMNodeObserver::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMNodeObserver*, this);
     }
-    else if (iid.Equals(nsIDOMElementObserver::IID())) {
+    else if (iid.Equals(nsIDOMElementObserver::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMElementObserver*, this);
     }
     else {
@@ -2054,7 +2054,7 @@ XULDocumentImpl::GetDocumentElement(nsIDOMElement** aDocumentElement)
   nsresult res = NS_ERROR_FAILURE;
 
   if (nsnull != mRootContent) {
-    res = mRootContent->QueryInterface(nsIDOMElement::IID(), (void**)aDocumentElement);
+    res = mRootContent->QueryInterface(nsIDOMElement::GetIID(), (void**)aDocumentElement);
     NS_ASSERTION(NS_OK == res, "Must be a DOM Element");
   }
   
@@ -2142,7 +2142,7 @@ XULDocumentImpl::GetElementsByTagName(const nsString& aTagName, nsIDOMNodeList**
 
     if (root != nsnull) {
         nsIDOMNode* domRoot;
-        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::IID(), (void**) &domRoot))) {
+        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::GetIID(), (void**) &domRoot))) {
             rv = GetElementsByTagName(domRoot, aTagName, elements);
             NS_RELEASE(domRoot);
         }
@@ -2169,7 +2169,7 @@ XULDocumentImpl::GetElementsByAttribute(const nsString& aAttribute, const nsStri
 
     if (root != nsnull) {
         nsIDOMNode* domRoot;
-        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::IID(), (void**) &domRoot))) {
+        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::GetIID(), (void**) &domRoot))) {
             rv = GetElementsByAttribute(domRoot, aAttribute, aValue, elements);
             NS_RELEASE(domRoot);
         }
@@ -2223,7 +2223,7 @@ XULDocumentImpl::GetElementByID(const nsString& aId, nsIDOMNode** aReturn)
 
     if (elements->Count() > 0) {
         nsISupports* element = elements->ElementAt(0);
-        rv = element->QueryInterface(nsIDOMNode::IID(), (void**) aReturn);
+        rv = element->QueryInterface(nsIDOMNode::GetIID(), (void**) aReturn);
         NS_ASSERTION(NS_SUCCEEDED(rv), "not a DOM node");
         NS_RELEASE(element);
         return rv;
@@ -2585,7 +2585,7 @@ XULDocumentImpl::OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnSetNodeValue(aNode, aValue);
             NS_RELEASE(obs);
         }
@@ -2605,7 +2605,7 @@ XULDocumentImpl::OnInsertBefore(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsID
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnInsertBefore(aParent, aNewChild, aRefChild);
             NS_RELEASE(obs);
         }
@@ -2625,7 +2625,7 @@ XULDocumentImpl::OnReplaceChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsID
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnReplaceChild(aParent, aNewChild, aOldChild);
             NS_RELEASE(obs);
         }
@@ -2645,7 +2645,7 @@ XULDocumentImpl::OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveChild(aParent, aOldChild);
             NS_RELEASE(obs);
         }
@@ -2665,7 +2665,7 @@ XULDocumentImpl::OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnAppendChild(aParent, aNewChild);
             NS_RELEASE(obs);
         }
@@ -2688,7 +2688,7 @@ XULDocumentImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& aName,
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnSetAttribute(aElement, aName, aValue);
             NS_RELEASE(obs);
         }
@@ -2706,7 +2706,7 @@ XULDocumentImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aNam
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveAttribute(aElement, aName);
             NS_RELEASE(obs);
         }
@@ -2724,7 +2724,7 @@ XULDocumentImpl::OnSetAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aNewAtt
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnSetAttributeNode(aElement, aNewAttr);
             NS_RELEASE(obs);
         }
@@ -2742,7 +2742,7 @@ XULDocumentImpl::OnRemoveAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aOld
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveAttributeNode(aElement, aOldAttr);
             NS_RELEASE(obs);
         }
diff --git a/mozilla/dom/public/base/nsIDOMHistory.h b/mozilla/dom/public/base/nsIDOMHistory.h
index 1f28ab97dde..a911e62bcbd 100644
--- a/mozilla/dom/public/base/nsIDOMHistory.h
+++ b/mozilla/dom/public/base/nsIDOMHistory.h
@@ -31,7 +31,7 @@
 
 class nsIDOMHistory : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHISTORY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHISTORY_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRInt32* aLength)=0;
 
diff --git a/mozilla/dom/public/base/nsIDOMLocation.h b/mozilla/dom/public/base/nsIDOMLocation.h
index f62c0183182..686d89b4dbf 100644
--- a/mozilla/dom/public/base/nsIDOMLocation.h
+++ b/mozilla/dom/public/base/nsIDOMLocation.h
@@ -32,7 +32,7 @@
 
 class nsIDOMLocation : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMLOCATION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMLOCATION_IID; return iid; }
 
   NS_IMETHOD    GetHash(nsString& aHash)=0;
   NS_IMETHOD    SetHash(const nsString& aHash)=0;
diff --git a/mozilla/dom/public/base/nsIDOMNavigator.h b/mozilla/dom/public/base/nsIDOMNavigator.h
index c85cf07cb6c..460cb25261a 100644
--- a/mozilla/dom/public/base/nsIDOMNavigator.h
+++ b/mozilla/dom/public/base/nsIDOMNavigator.h
@@ -31,7 +31,7 @@
 
 class nsIDOMNavigator : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNAVIGATOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNAVIGATOR_IID; return iid; }
 
   NS_IMETHOD    GetUserAgent(nsString& aUserAgent)=0;
 
diff --git a/mozilla/dom/public/base/nsIDOMScreen.h b/mozilla/dom/public/base/nsIDOMScreen.h
index 11997b44cd0..9f6e6f6d8be 100644
--- a/mozilla/dom/public/base/nsIDOMScreen.h
+++ b/mozilla/dom/public/base/nsIDOMScreen.h
@@ -31,7 +31,7 @@
 
 class nsIDOMScreen : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSCREEN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSCREEN_IID; return iid; }
 
   NS_IMETHOD    GetWidth(PRInt32* aWidth)=0;
 
diff --git a/mozilla/dom/public/base/nsIDOMWindow.h b/mozilla/dom/public/base/nsIDOMWindow.h
index dcaadb0d80d..19e5637c8fc 100644
--- a/mozilla/dom/public/base/nsIDOMWindow.h
+++ b/mozilla/dom/public/base/nsIDOMWindow.h
@@ -38,7 +38,7 @@ class nsIDOMWindow;
 
 class nsIDOMWindow : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMWINDOW_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOW_IID; return iid; }
 
   NS_IMETHOD    GetWindow(nsIDOMWindow** aWindow)=0;
 
diff --git a/mozilla/dom/public/base/nsIDOMWindowCollection.h b/mozilla/dom/public/base/nsIDOMWindowCollection.h
index 8c603aa5714..a961272ea42 100644
--- a/mozilla/dom/public/base/nsIDOMWindowCollection.h
+++ b/mozilla/dom/public/base/nsIDOMWindowCollection.h
@@ -32,7 +32,7 @@ class nsIDOMWindow;
 
 class nsIDOMWindowCollection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMWINDOWCOLLECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMWINDOWCOLLECTION_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMAttr.h b/mozilla/dom/public/coreDom/nsIDOMAttr.h
index 526f494e84f..05911304ef3 100644
--- a/mozilla/dom/public/coreDom/nsIDOMAttr.h
+++ b/mozilla/dom/public/coreDom/nsIDOMAttr.h
@@ -32,7 +32,7 @@
 
 class nsIDOMAttr : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMATTR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMATTR_IID; return iid; }
 
   NS_IMETHOD    GetName(nsString& aName)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMCDATASection.h b/mozilla/dom/public/coreDom/nsIDOMCDATASection.h
index 73ad0410a1d..3132b293194 100644
--- a/mozilla/dom/public/coreDom/nsIDOMCDATASection.h
+++ b/mozilla/dom/public/coreDom/nsIDOMCDATASection.h
@@ -32,7 +32,7 @@
 
 class nsIDOMCDATASection : public nsIDOMText {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCDATASECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCDATASECTION_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMCharacterData.h b/mozilla/dom/public/coreDom/nsIDOMCharacterData.h
index 5d8d20b7a3b..18d3e4c5fd1 100644
--- a/mozilla/dom/public/coreDom/nsIDOMCharacterData.h
+++ b/mozilla/dom/public/coreDom/nsIDOMCharacterData.h
@@ -32,7 +32,7 @@
 
 class nsIDOMCharacterData : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCHARACTERDATA_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCHARACTERDATA_IID; return iid; }
 
   NS_IMETHOD    GetData(nsString& aData)=0;
   NS_IMETHOD    SetData(const nsString& aData)=0;
diff --git a/mozilla/dom/public/coreDom/nsIDOMComment.h b/mozilla/dom/public/coreDom/nsIDOMComment.h
index 00e1d22c400..8f1dca0d590 100644
--- a/mozilla/dom/public/coreDom/nsIDOMComment.h
+++ b/mozilla/dom/public/coreDom/nsIDOMComment.h
@@ -32,7 +32,7 @@
 
 class nsIDOMComment : public nsIDOMCharacterData {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCOMMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCOMMENT_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h b/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h
index 8769ec6fc54..f8d422191c6 100644
--- a/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h
+++ b/mozilla/dom/public/coreDom/nsIDOMDOMImplementation.h
@@ -31,7 +31,7 @@
 
 class nsIDOMDOMImplementation : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMDOMIMPLEMENTATION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOMIMPLEMENTATION_IID; return iid; }
 
   NS_IMETHOD    HasFeature(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn)=0;
 };
diff --git a/mozilla/dom/public/coreDom/nsIDOMDocument.h b/mozilla/dom/public/coreDom/nsIDOMDocument.h
index f40df208ccd..3ecf31fe8f6 100644
--- a/mozilla/dom/public/coreDom/nsIDOMDocument.h
+++ b/mozilla/dom/public/coreDom/nsIDOMDocument.h
@@ -43,7 +43,7 @@ class nsIDOMNodeList;
 
 class nsIDOMDocument : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetDoctype(nsIDOMDocumentType** aDoctype)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h b/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h
index 7ccf0acff33..4886952ae27 100644
--- a/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h
+++ b/mozilla/dom/public/coreDom/nsIDOMDocumentFragment.h
@@ -32,7 +32,7 @@
 
 class nsIDOMDocumentFragment : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENTFRAGMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTFRAGMENT_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMDocumentType.h b/mozilla/dom/public/coreDom/nsIDOMDocumentType.h
index badd6306438..f440dc16988 100644
--- a/mozilla/dom/public/coreDom/nsIDOMDocumentType.h
+++ b/mozilla/dom/public/coreDom/nsIDOMDocumentType.h
@@ -33,7 +33,7 @@ class nsIDOMNamedNodeMap;
 
 class nsIDOMDocumentType : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMDOCUMENTTYPE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTTYPE_IID; return iid; }
 
   NS_IMETHOD    GetName(nsString& aName)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMElement.h b/mozilla/dom/public/coreDom/nsIDOMElement.h
index 9d950a93a26..33d3362297f 100644
--- a/mozilla/dom/public/coreDom/nsIDOMElement.h
+++ b/mozilla/dom/public/coreDom/nsIDOMElement.h
@@ -34,7 +34,7 @@ class nsIDOMNodeList;
 
 class nsIDOMElement : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetTagName(nsString& aTagName)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMEntity.h b/mozilla/dom/public/coreDom/nsIDOMEntity.h
index 1fc6f912b9d..9510f111a6b 100644
--- a/mozilla/dom/public/coreDom/nsIDOMEntity.h
+++ b/mozilla/dom/public/coreDom/nsIDOMEntity.h
@@ -32,7 +32,7 @@
 
 class nsIDOMEntity : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMENTITY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMENTITY_IID; return iid; }
 
   NS_IMETHOD    GetPublicId(nsString& aPublicId)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMEntityReference.h b/mozilla/dom/public/coreDom/nsIDOMEntityReference.h
index a04b0c26178..149348a8feb 100644
--- a/mozilla/dom/public/coreDom/nsIDOMEntityReference.h
+++ b/mozilla/dom/public/coreDom/nsIDOMEntityReference.h
@@ -32,7 +32,7 @@
 
 class nsIDOMEntityReference : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMENTITYREFERENCE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMENTITYREFERENCE_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMNSDocument.h b/mozilla/dom/public/coreDom/nsIDOMNSDocument.h
index 65cc75394d6..65ce8481cbf 100644
--- a/mozilla/dom/public/coreDom/nsIDOMNSDocument.h
+++ b/mozilla/dom/public/coreDom/nsIDOMNSDocument.h
@@ -32,7 +32,7 @@ class nsIDOMStyleSheetCollection;
 
 class nsIDOMNSDocument : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNSDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetStyleSheets(nsIDOMStyleSheetCollection** aStyleSheets)=0;
 };
diff --git a/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h b/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h
index 72ffa3615fc..89d20c08e9b 100644
--- a/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h
+++ b/mozilla/dom/public/coreDom/nsIDOMNamedNodeMap.h
@@ -32,7 +32,7 @@ class nsIDOMNode;
 
 class nsIDOMNamedNodeMap : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNAMEDNODEMAP_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNAMEDNODEMAP_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMNode.h b/mozilla/dom/public/coreDom/nsIDOMNode.h
index 5b6719a651d..688162a0e1f 100644
--- a/mozilla/dom/public/coreDom/nsIDOMNode.h
+++ b/mozilla/dom/public/coreDom/nsIDOMNode.h
@@ -35,7 +35,7 @@ class nsIDOMNodeList;
 
 class nsIDOMNode : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNODE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODE_IID; return iid; }
   enum {
     ELEMENT_NODE = 1,
     ATTRIBUTE_NODE = 2,
diff --git a/mozilla/dom/public/coreDom/nsIDOMNodeList.h b/mozilla/dom/public/coreDom/nsIDOMNodeList.h
index 53cc4de84d7..9b8a27c0545 100644
--- a/mozilla/dom/public/coreDom/nsIDOMNodeList.h
+++ b/mozilla/dom/public/coreDom/nsIDOMNodeList.h
@@ -32,7 +32,7 @@ class nsIDOMNode;
 
 class nsIDOMNodeList : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNODELIST_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODELIST_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMNotation.h b/mozilla/dom/public/coreDom/nsIDOMNotation.h
index 3cf8840236c..58f9d09e8d5 100644
--- a/mozilla/dom/public/coreDom/nsIDOMNotation.h
+++ b/mozilla/dom/public/coreDom/nsIDOMNotation.h
@@ -32,7 +32,7 @@
 
 class nsIDOMNotation : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNOTATION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNOTATION_IID; return iid; }
 
   NS_IMETHOD    GetPublicId(nsString& aPublicId)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h b/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h
index e34a9f06e1c..f617b2cb5d7 100644
--- a/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h
+++ b/mozilla/dom/public/coreDom/nsIDOMProcessingInstruction.h
@@ -32,7 +32,7 @@
 
 class nsIDOMProcessingInstruction : public nsIDOMNode {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMPROCESSINGINSTRUCTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMPROCESSINGINSTRUCTION_IID; return iid; }
 
   NS_IMETHOD    GetTarget(nsString& aTarget)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMRange.h b/mozilla/dom/public/coreDom/nsIDOMRange.h
index c1b1c4e48a9..0a41bbd8abc 100644
--- a/mozilla/dom/public/coreDom/nsIDOMRange.h
+++ b/mozilla/dom/public/coreDom/nsIDOMRange.h
@@ -34,7 +34,7 @@ class nsIDOMRange;
 
 class nsIDOMRange : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMRANGE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMRANGE_IID; return iid; }
   enum {
     START_TO_START = 0,
     START_TO_END = 1,
diff --git a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
index 6a3516d125d..c980e2ea91e 100644
--- a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
+++ b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
@@ -31,7 +31,7 @@
 
 class nsIDOMStyleSheet : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSTYLESHEET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSTYLESHEET_IID; return iid; }
 
   NS_IMETHOD    GetType(nsString& aType)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h b/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h
index 6b9f6ae0ff7..e457c73f100 100644
--- a/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h
+++ b/mozilla/dom/public/coreDom/nsIDOMStyleSheetCollection.h
@@ -32,7 +32,7 @@ class nsIDOMStyleSheet;
 
 class nsIDOMStyleSheetCollection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSTYLESHEETCOLLECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSTYLESHEETCOLLECTION_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/coreDom/nsIDOMText.h b/mozilla/dom/public/coreDom/nsIDOMText.h
index c8370a63436..f37b8af911d 100644
--- a/mozilla/dom/public/coreDom/nsIDOMText.h
+++ b/mozilla/dom/public/coreDom/nsIDOMText.h
@@ -33,7 +33,7 @@ class nsIDOMText;
 
 class nsIDOMText : public nsIDOMCharacterData {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMTEXT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMTEXT_IID; return iid; }
 
   NS_IMETHOD    SplitText(PRUint32 aOffset, nsIDOMText** aReturn)=0;
 };
diff --git a/mozilla/dom/public/coreEvents/nsIDOMEvent.h b/mozilla/dom/public/coreEvents/nsIDOMEvent.h
index 3281e00d086..9dc31843114 100644
--- a/mozilla/dom/public/coreEvents/nsIDOMEvent.h
+++ b/mozilla/dom/public/coreEvents/nsIDOMEvent.h
@@ -32,7 +32,7 @@ class nsIDOMNode;
 
 class nsIDOMEvent : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMEVENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENT_IID; return iid; }
   enum {
     VK_CANCEL = 3,
     VK_BACK = 8,
diff --git a/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h b/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h
index 18b44d2b24c..8d6fe7a3dac 100644
--- a/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h
+++ b/mozilla/dom/public/coreEvents/nsIDOMEventCapturer.h
@@ -32,7 +32,7 @@
 
 class nsIDOMEventCapturer : public nsIDOMEventReceiver {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMEVENTCAPTURER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTCAPTURER_IID; return iid; }
 
   NS_IMETHOD    CaptureEvent(const nsString& aType)=0;
 
diff --git a/mozilla/dom/public/coreEvents/nsIDOMEventListener.h b/mozilla/dom/public/coreEvents/nsIDOMEventListener.h
index 349dedbd734..8f88943e251 100644
--- a/mozilla/dom/public/coreEvents/nsIDOMEventListener.h
+++ b/mozilla/dom/public/coreEvents/nsIDOMEventListener.h
@@ -35,7 +35,7 @@ class nsIDOMEventListener : public nsISupports {
 
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_IDOMEVENTLISTENER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTLISTENER_IID; return iid; }
 
  /**
   * Processes all events excepting mouse and key events. 
diff --git a/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h b/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h
index 1c3c5fb8dc9..94306d6b921 100644
--- a/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h
+++ b/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h
@@ -40,7 +40,7 @@ class nsIEventListenerManager;
 class nsIDOMEventReceiver : public nsISupports {
 
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMEVENTRECEIVER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTRECEIVER_IID; return iid; }
 
   NS_IMETHOD AddEventListener(nsIDOMEventListener *aListener, const nsIID& aIID) = 0;
   NS_IMETHOD RemoveEventListener(nsIDOMEventListener *aListener, const nsIID& aIID) = 0;
diff --git a/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h b/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h
index 3ec8c50ce93..69d96a2f6cd 100644
--- a/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h
+++ b/mozilla/dom/public/coreEvents/nsIDOMNSEvent.h
@@ -32,7 +32,7 @@ class nsIDOMRenderingContext;
 
 class nsIDOMNSEvent : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNSEVENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSEVENT_IID; return iid; }
   enum {
     EVENT_MOUSEDOWN = 1,
     EVENT_MOUSEUP = 2,
diff --git a/mozilla/dom/public/css/nsIDOMCSS2Properties.h b/mozilla/dom/public/css/nsIDOMCSS2Properties.h
index 8d58ebae188..2efdd60fb31 100644
--- a/mozilla/dom/public/css/nsIDOMCSS2Properties.h
+++ b/mozilla/dom/public/css/nsIDOMCSS2Properties.h
@@ -32,7 +32,7 @@
 
 class nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSS2PROPERTIES_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSS2PROPERTIES_IID; return iid; }
 
   NS_IMETHOD    GetAzimuth(nsString& aAzimuth)=0;
   NS_IMETHOD    SetAzimuth(const nsString& aAzimuth)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
index cf548ba27fb..3976dbfd5e7 100644
--- a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleDeclaration;
 
 class nsIDOMCSSFontFaceRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSFONTFACERULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSFONTFACERULE_IID; return iid; }
 
   NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0;
   NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSImportRule.h b/mozilla/dom/public/css/nsIDOMCSSImportRule.h
index de0a581865f..986ea0ffd0c 100644
--- a/mozilla/dom/public/css/nsIDOMCSSImportRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSImportRule.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleSheet;
 
 class nsIDOMCSSImportRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSIMPORTRULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSIMPORTRULE_IID; return iid; }
 
   NS_IMETHOD    GetHref(nsString& aHref)=0;
   NS_IMETHOD    SetHref(const nsString& aHref)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
index 63cdecb23ae..e875c5d732e 100644
--- a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleRuleCollection;
 
 class nsIDOMCSSMediaRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSMEDIARULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSMEDIARULE_IID; return iid; }
 
   NS_IMETHOD    GetMediaTypes(nsString& aMediaTypes)=0;
   NS_IMETHOD    SetMediaTypes(const nsString& aMediaTypes)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSPageRule.h b/mozilla/dom/public/css/nsIDOMCSSPageRule.h
index c45be34a377..0a965e7cca1 100644
--- a/mozilla/dom/public/css/nsIDOMCSSPageRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSPageRule.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleDeclaration;
 
 class nsIDOMCSSPageRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSPAGERULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSPAGERULE_IID; return iid; }
 
   NS_IMETHOD    GetName(nsString& aName)=0;
   NS_IMETHOD    SetName(const nsString& aName)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSRule.h b/mozilla/dom/public/css/nsIDOMCSSRule.h
index 521907051b3..09dfc983bee 100644
--- a/mozilla/dom/public/css/nsIDOMCSSRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSRule.h
@@ -32,7 +32,7 @@ class nsIDOMCSSStyleSheet;
 
 class nsIDOMCSSRule : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSRULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSRULE_IID; return iid; }
   enum {
     UNKNOWN_RULE = 0,
     STYLE_RULE = 1,
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
index 630f9489b0d..ad66b9e2620 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
@@ -31,7 +31,7 @@
 
 class nsIDOMCSSStyleDeclaration : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLEDECLARATION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLEDECLARATION_IID; return iid; }
 
   NS_IMETHOD    GetCssText(nsString& aCssText)=0;
   NS_IMETHOD    SetCssText(const nsString& aCssText)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
index 38c6de6dd47..37ad0e107ee 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleDeclaration;
 
 class nsIDOMCSSStyleRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLERULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLERULE_IID; return iid; }
 
   NS_IMETHOD    GetSelectorText(nsString& aSelectorText)=0;
   NS_IMETHOD    SetSelectorText(const nsString& aSelectorText)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h b/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h
index c3fa51becaf..8d415e07985 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleRuleCollection.h
@@ -32,7 +32,7 @@ class nsIDOMCSSStyleRule;
 
 class nsIDOMCSSStyleRuleCollection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLERULECOLLECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLERULECOLLECTION_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
index 49490a36d24..7da5cca1f93 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
@@ -35,7 +35,7 @@ class nsIDOMCSSStyleRuleCollection;
 
 class nsIDOMCSSStyleSheet : public nsIDOMStyleSheet {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSSTYLESHEET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLESHEET_IID; return iid; }
 
   NS_IMETHOD    GetOwningNode(nsIDOMNode** aOwningNode)=0;
 
diff --git a/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h
index 4b2fabcd696..8bb7dd9fb72 100644
--- a/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h
@@ -32,7 +32,7 @@
 
 class nsIDOMCSSUnknownRule : public nsIDOMCSSRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMCSSUNKNOWNRULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSUNKNOWNRULE_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h b/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h
index f8d2d892b27..12fa20f7efd 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLAnchorElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLAnchorElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLANCHORELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLANCHORELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAccessKey(nsString& aAccessKey)=0;
   NS_IMETHOD    SetAccessKey(const nsString& aAccessKey)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h b/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h
index 877827100a5..1c6cc9805d3 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLAppletElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLAppletElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLAPPLETELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAPPLETELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h b/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h
index 2118ee9e06f..ef8b3b7110a 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLAreaElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLAreaElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLAREAELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAREAELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAccessKey(nsString& aAccessKey)=0;
   NS_IMETHOD    SetAccessKey(const nsString& aAccessKey)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLBRElement.h b/mozilla/dom/public/html/nsIDOMHTMLBRElement.h
index 16e6d38b378..0e678282a76 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLBRElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLBRElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLBRElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBRELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBRELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetClear(nsString& aClear)=0;
   NS_IMETHOD    SetClear(const nsString& aClear)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h b/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h
index 1631cdb6782..c82673de768 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLBaseElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLBaseElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBASEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetHref(nsString& aHref)=0;
   NS_IMETHOD    SetHref(const nsString& aHref)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h b/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h
index 6dc90270ccb..d322eaf06cf 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLBaseFontElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLBaseFontElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBASEFONTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEFONTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetColor(nsString& aColor)=0;
   NS_IMETHOD    SetColor(const nsString& aColor)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h b/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h
index bf5a2240dbb..7de3982a343 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLBlockquoteElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLBlockquoteElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBLOCKQUOTEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBLOCKQUOTEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCite(nsString& aCite)=0;
   NS_IMETHOD    SetCite(const nsString& aCite)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h b/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h
index 44e4a6983ea..37c4e15167e 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLBodyElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLBodyElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBODYELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBODYELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetALink(nsString& aALink)=0;
   NS_IMETHOD    SetALink(const nsString& aALink)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h b/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h
index a177cf870c6..490dfa0a38a 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLButtonElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLButtonElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLBUTTONELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBUTTONELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLCollection.h b/mozilla/dom/public/html/nsIDOMHTMLCollection.h
index 4eb0d1e8860..389600ca7c8 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLCollection.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLCollection.h
@@ -32,7 +32,7 @@ class nsIDOMNode;
 
 class nsIDOMHTMLCollection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLCOLLECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLCOLLECTION_IID; return iid; }
 
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLDListElement.h b/mozilla/dom/public/html/nsIDOMHTMLDListElement.h
index 8408fc2b35e..00f0222e875 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLDListElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLDListElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLDListElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDLISTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDLISTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCompact(PRBool* aCompact)=0;
   NS_IMETHOD    SetCompact(PRBool aCompact)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h b/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h
index 47d1572ded3..f555bca16e0 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLDirectoryElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLDirectoryElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDIRECTORYELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDIRECTORYELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCompact(PRBool* aCompact)=0;
   NS_IMETHOD    SetCompact(PRBool aCompact)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLDivElement.h b/mozilla/dom/public/html/nsIDOMHTMLDivElement.h
index 7e842d5beb6..3b20fe60902 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLDivElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLDivElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLDivElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDIVELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDIVELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLDocument.h b/mozilla/dom/public/html/nsIDOMHTMLDocument.h
index 9da50e81acf..96c4c07562b 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLDocument.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLDocument.h
@@ -37,7 +37,7 @@ class nsIDOMNodeList;
 
 class nsIDOMHTMLDocument : public nsIDOMDocument {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetTitle(nsString& aTitle)=0;
   NS_IMETHOD    SetTitle(const nsString& aTitle)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLElement.h b/mozilla/dom/public/html/nsIDOMHTMLElement.h
index 22b02ff32c2..6c2f0faa15a 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLElement.h
@@ -33,7 +33,7 @@ class nsIDOMCSSStyleDeclaration;
 
 class nsIDOMHTMLElement : public nsIDOMElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetId(nsString& aId)=0;
   NS_IMETHOD    SetId(const nsString& aId)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h b/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h
index 14823f5fd5a..857aaab3cf7 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLFieldSetElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLFieldSetElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFIELDSETELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFIELDSETELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 };
diff --git a/mozilla/dom/public/html/nsIDOMHTMLFontElement.h b/mozilla/dom/public/html/nsIDOMHTMLFontElement.h
index f1f9d736551..7187f6c1260 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLFontElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLFontElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLFontElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFONTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFONTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetColor(nsString& aColor)=0;
   NS_IMETHOD    SetColor(const nsString& aColor)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLFormElement.h b/mozilla/dom/public/html/nsIDOMHTMLFormElement.h
index 617afd86b8f..e9dda77cf9f 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLFormElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLFormElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLFormElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFORMELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFORMELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetElements(nsIDOMHTMLCollection** aElements)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h b/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h
index 0a65f4bd72a..72b1f25b8d8 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLFrameElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLFrameElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFRAMEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetFrameBorder(nsString& aFrameBorder)=0;
   NS_IMETHOD    SetFrameBorder(const nsString& aFrameBorder)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h b/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h
index 59fc5880232..5e5a4bd6f7c 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLFrameSetElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLFrameSetElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLFRAMESETELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMESETELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCols(nsString& aCols)=0;
   NS_IMETHOD    SetCols(const nsString& aCols)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLHRElement.h b/mozilla/dom/public/html/nsIDOMHTMLHRElement.h
index a1a276a70c1..2e773c26fc2 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLHRElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLHRElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLHRElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHRELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHRELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h b/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h
index fe924b2c528..2f21866cfff 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLHeadElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLHeadElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHEADELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetProfile(nsString& aProfile)=0;
   NS_IMETHOD    SetProfile(const nsString& aProfile)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h b/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h
index 5b217f0e686..823623db1af 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLHeadingElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLHeadingElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHEADINGELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADINGELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h b/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h
index 2bc0b5fb11a..2e8a0ac7c13 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLHtmlElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLHtmlElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLHTMLELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHTMLELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetVersion(nsString& aVersion)=0;
   NS_IMETHOD    SetVersion(const nsString& aVersion)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h b/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h
index 9ef5d7c415d..09198e6aa82 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLIFrameElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLIFrameElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLIFRAMEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIFRAMEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLImageElement.h b/mozilla/dom/public/html/nsIDOMHTMLImageElement.h
index c0bc263d6cc..1930f220e6c 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLImageElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLImageElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLImageElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLIMAGEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIMAGEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetLowSrc(nsString& aLowSrc)=0;
   NS_IMETHOD    SetLowSrc(const nsString& aLowSrc)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLInputElement.h b/mozilla/dom/public/html/nsIDOMHTMLInputElement.h
index ab47e9edfcb..a77a31bd12c 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLInputElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLInputElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLInputElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLINPUTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLINPUTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetDefaultValue(nsString& aDefaultValue)=0;
   NS_IMETHOD    SetDefaultValue(const nsString& aDefaultValue)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h b/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h
index cfdab3ef19a..9fea388d880 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLIsIndexElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLIsIndexElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLISINDEXELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLISINDEXELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLLIElement.h b/mozilla/dom/public/html/nsIDOMHTMLLIElement.h
index aae70663d46..51607679822 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLLIElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLLIElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLLIElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLIELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLIELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetType(nsString& aType)=0;
   NS_IMETHOD    SetType(const nsString& aType)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h b/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h
index a709a513526..f8d669aaffa 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLLabelElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLLabelElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLABELELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLABELELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h b/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h
index 9ecdca4780e..9edb46689b2 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLLegendElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLLegendElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLEGENDELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLEGENDELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h b/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h
index 8efa244f1e6..e2bf5d07c01 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLLinkElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLLinkElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLLINKELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLINKELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetDisabled(PRBool* aDisabled)=0;
   NS_IMETHOD    SetDisabled(PRBool aDisabled)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLMapElement.h b/mozilla/dom/public/html/nsIDOMHTMLMapElement.h
index acfced8faa0..d990fd67b1d 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLMapElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLMapElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLMapElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMAPELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMAPELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAreas(nsIDOMHTMLCollection** aAreas)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h b/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h
index 7eea7a70cfb..9731f623107 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLMenuElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLMenuElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMENUELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMENUELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCompact(PRBool* aCompact)=0;
   NS_IMETHOD    SetCompact(PRBool aCompact)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h b/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h
index 27b203b02f2..c9adda0047a 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLMetaElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLMetaElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMETAELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMETAELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetContent(nsString& aContent)=0;
   NS_IMETHOD    SetContent(const nsString& aContent)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLModElement.h b/mozilla/dom/public/html/nsIDOMHTMLModElement.h
index f07a055208b..c7316491e3c 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLModElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLModElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLModElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLMODELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMODELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCite(nsString& aCite)=0;
   NS_IMETHOD    SetCite(const nsString& aCite)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLOListElement.h b/mozilla/dom/public/html/nsIDOMHTMLOListElement.h
index 96c1df5685c..a3aa52c35bb 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLOListElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLOListElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLOListElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOLISTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOLISTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCompact(PRBool* aCompact)=0;
   NS_IMETHOD    SetCompact(PRBool aCompact)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h b/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h
index 12e9f7892cd..c81e1a7ccaf 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLObjectElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLObjectElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOBJECTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOBJECTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h b/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h
index 01d3da0878f..399825c7761 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLOptGroupElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLOptGroupElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOPTGROUPELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOPTGROUPELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetDisabled(PRBool* aDisabled)=0;
   NS_IMETHOD    SetDisabled(PRBool aDisabled)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h
index 09a13c33e48..f635b610349 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLOptionElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLOptionElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLOPTIONELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLOPTIONELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetForm(nsIDOMHTMLFormElement** aForm)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h b/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h
index e46898bcba6..2f669d5836a 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLParagraphElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLParagraphElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPARAGRAPHELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAGRAPHELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLParamElement.h b/mozilla/dom/public/html/nsIDOMHTMLParamElement.h
index 7f39bf8ab69..9a0ef9636f5 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLParamElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLParamElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLParamElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPARAMELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAMELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetName(nsString& aName)=0;
   NS_IMETHOD    SetName(const nsString& aName)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLPreElement.h b/mozilla/dom/public/html/nsIDOMHTMLPreElement.h
index a63011849a2..74d93878385 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLPreElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLPreElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLPreElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLPREELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPREELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetWidth(PRInt32* aWidth)=0;
   NS_IMETHOD    SetWidth(PRInt32 aWidth)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h b/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h
index 8e3627df511..7155f12251c 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLQuoteElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLQuoteElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLQUOTEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLQUOTEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCite(nsString& aCite)=0;
   NS_IMETHOD    SetCite(const nsString& aCite)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h b/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h
index e92831f2597..61100a8e967 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLScriptElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLScriptElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSCRIPTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSCRIPTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetText(nsString& aText)=0;
   NS_IMETHOD    SetText(const nsString& aText)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h b/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h
index 1af6da4eb16..837651f4e0b 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLSelectElement.h
@@ -35,7 +35,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLSelectElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSELECTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSELECTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetType(nsString& aType)=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h b/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h
index d67642aa8a3..e77b12041f5 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLStyleElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLStyleElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLSTYLEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSTYLEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetDisabled(PRBool* aDisabled)=0;
   NS_IMETHOD    SetDisabled(PRBool aDisabled)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h
index f290a6ec773..3daa37eeaed 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableCaptionElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLTableCaptionElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECAPTIONELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECAPTIONELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h
index 702636e4d47..864132d039e 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableCellElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLTableCellElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECELLELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECELLELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCellIndex(PRInt32* aCellIndex)=0;
   NS_IMETHOD    SetCellIndex(PRInt32 aCellIndex)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h
index 910c793728a..2aa1db7c354 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableColElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLTableColElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLECOLELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECOLELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableElement.h
index 6eaff9ac0e2..cfa82e921b5 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableElement.h
@@ -36,7 +36,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLTableElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCaption(nsIDOMHTMLTableCaptionElement** aCaption)=0;
   NS_IMETHOD    SetCaption(nsIDOMHTMLTableCaptionElement* aCaption)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h
index c0ee857c5e5..aea71d74660 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableRowElement.h
@@ -34,7 +34,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLTableRowElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLEROWELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLEROWELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetRowIndex(PRInt32* aRowIndex)=0;
   NS_IMETHOD    SetRowIndex(PRInt32 aRowIndex)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h b/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h
index c4df839e0c1..029e171a640 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTableSectionElement.h
@@ -34,7 +34,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMHTMLTableSectionElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTABLESECTIONELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLESECTIONELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlign(nsString& aAlign)=0;
   NS_IMETHOD    SetAlign(const nsString& aAlign)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h b/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h
index f398c299f19..d697ff5f32e 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTextAreaElement.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLFormElement;
 
 class nsIDOMHTMLTextAreaElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTEXTAREAELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTEXTAREAELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetDefaultValue(nsString& aDefaultValue)=0;
   NS_IMETHOD    SetDefaultValue(const nsString& aDefaultValue)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h b/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h
index 35758f85e8d..d3126ab2833 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLTitleElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLTitleElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLTITLEELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTITLEELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetText(nsString& aText)=0;
   NS_IMETHOD    SetText(const nsString& aText)=0;
diff --git a/mozilla/dom/public/html/nsIDOMHTMLUListElement.h b/mozilla/dom/public/html/nsIDOMHTMLUListElement.h
index a4f2baae7af..7fad0f99910 100644
--- a/mozilla/dom/public/html/nsIDOMHTMLUListElement.h
+++ b/mozilla/dom/public/html/nsIDOMHTMLUListElement.h
@@ -32,7 +32,7 @@
 
 class nsIDOMHTMLUListElement : public nsIDOMHTMLElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMHTMLULISTELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLULISTELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetCompact(PRBool* aCompact)=0;
   NS_IMETHOD    SetCompact(PRBool aCompact)=0;
diff --git a/mozilla/dom/public/html/nsIDOMImage.h b/mozilla/dom/public/html/nsIDOMImage.h
index cfa57d2fdf5..4e9938545fe 100644
--- a/mozilla/dom/public/html/nsIDOMImage.h
+++ b/mozilla/dom/public/html/nsIDOMImage.h
@@ -31,7 +31,7 @@
 
 class nsIDOMImage : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMIMAGE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMIMAGE_IID; return iid; }
 };
 
 
diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h b/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h
index 199d4bd17ca..1d9d9b34263 100644
--- a/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h
+++ b/mozilla/dom/public/html/nsIDOMNSHTMLButtonElement.h
@@ -31,7 +31,7 @@
 
 class nsIDOMNSHTMLButtonElement : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLBUTTONELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLBUTTONELEMENT_IID; return iid; }
 
   NS_IMETHOD    Blur()=0;
 
diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
index fd6c2833173..d152f2193d3 100644
--- a/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
+++ b/mozilla/dom/public/html/nsIDOMNSHTMLDocument.h
@@ -33,7 +33,7 @@ class nsIDOMHTMLCollection;
 
 class nsIDOMNSHTMLDocument : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetAlinkColor(nsString& aAlinkColor)=0;
   NS_IMETHOD    SetAlinkColor(const nsString& aAlinkColor)=0;
diff --git a/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h b/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h
index 5421a16e192..aa7a8ef3878 100644
--- a/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h
+++ b/mozilla/dom/public/html/nsIDOMNSHTMLFormElement.h
@@ -32,7 +32,7 @@ class nsIDOMElement;
 
 class nsIDOMNSHTMLFormElement : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNSHTMLFORMELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLFORMELEMENT_IID; return iid; }
 
   NS_IMETHOD    GetEncoding(nsString& aEncoding)=0;
 
diff --git a/mozilla/dom/public/nsIScriptContext.h b/mozilla/dom/public/nsIScriptContext.h
index 651d5849399..5d010b3f947 100644
--- a/mozilla/dom/public/nsIScriptContext.h
+++ b/mozilla/dom/public/nsIScriptContext.h
@@ -41,7 +41,7 @@ class nsIScriptNameSpaceManager;
  */
 class nsIScriptContext : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISCRIPTCONTEXT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISCRIPTCONTEXT_IID; return iid; }
 
   /**
    * Execute a script.
diff --git a/mozilla/dom/public/nsIScriptContextOwner.h b/mozilla/dom/public/nsIScriptContextOwner.h
index 7d63264af41..2769932255d 100644
--- a/mozilla/dom/public/nsIScriptContextOwner.h
+++ b/mozilla/dom/public/nsIScriptContextOwner.h
@@ -38,7 +38,7 @@ class nsIScriptContext;
 
 class nsIScriptContextOwner : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISCRIPTCONTEXTOWNER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISCRIPTCONTEXTOWNER_IID; return iid; }
 
   /**
    * Returns a script context. The assumption is that the
diff --git a/mozilla/dom/public/xul/nsIDOMXULDocument.h b/mozilla/dom/public/xul/nsIDOMXULDocument.h
index 0059ad50126..500a42ed8ea 100644
--- a/mozilla/dom/public/xul/nsIDOMXULDocument.h
+++ b/mozilla/dom/public/xul/nsIDOMXULDocument.h
@@ -34,7 +34,7 @@ class nsIDOMNodeList;
 
 class nsIDOMXULDocument : public nsIDOMDocument {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetElementByID(const nsString& aId, nsIDOMNode** aReturn)=0;
 
diff --git a/mozilla/dom/public/xul/nsIDOMXULElement.h b/mozilla/dom/public/xul/nsIDOMXULElement.h
index 8ff9bac183c..66914ee784e 100644
--- a/mozilla/dom/public/xul/nsIDOMXULElement.h
+++ b/mozilla/dom/public/xul/nsIDOMXULElement.h
@@ -34,7 +34,7 @@ class nsIDOMNodeList;
 
 class nsIDOMXULElement : public nsIDOMElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
 
   NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMNode* aNode)=0;
 
diff --git a/mozilla/dom/tools/XPCOMGen.cpp b/mozilla/dom/tools/XPCOMGen.cpp
index d59b65ee9e6..62efcfb740d 100644
--- a/mozilla/dom/tools/XPCOMGen.cpp
+++ b/mozilla/dom/tools/XPCOMGen.cpp
@@ -54,7 +54,7 @@ static const char *kClassDeclStr = "class nsIDOM%s : ";
 static const char *kBaseClassStr = "public nsIDOM%s";
 static const char *kNoBaseClassStr = "public nsISupports";
 static const char *kClassPrologStr = " {\npublic:\n";
-static const char *kStaticIIDStr = "  static const nsIID& IID() { static nsIID iid = %s; return iid; }\n";
+static const char *kStaticIIDStr = "  static const nsIID& GetIID() { static nsIID iid = %s; return iid; }\n";
 static const char *kEnumDeclBeginStr = "  enum {\n";
 static const char *kEnumEntryStr = "    %s = %d%s\n";
 static const char *kEnumDeclEndStr = "  };\n";
diff --git a/mozilla/editor/base/DeleteRangeTxn.cpp b/mozilla/editor/base/DeleteRangeTxn.cpp
index 159ac039a54..5c7bb8e8119 100644
--- a/mozilla/editor/base/DeleteRangeTxn.cpp
+++ b/mozilla/editor/base/DeleteRangeTxn.cpp
@@ -395,7 +395,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommon
         // test if child is an ancestor of the other node.  If it is, don't process this parent anymore
         PRInt32 index;
         nsISupports *childAsISupports;
-        child->QueryInterface(nsISupports::IID(), (void **)&childAsISupports);
+        child->QueryInterface(nsISupports::GetIID(), (void **)&childAsISupports);
         index = ancestorList->IndexOf(childAsISupports);
         if (-1!=index)
           break;
@@ -521,7 +521,7 @@ NS_IMETHODIMP DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsAr
     while ((NS_SUCCEEDED(result)) && child && parent)
     {
       nsISupports * parentAsISupports;
-      parent->QueryInterface(nsISupports::IID(), (void **)&parentAsISupports);
+      parent->QueryInterface(nsISupports::GetIID(), (void **)&parentAsISupports);
       aList->AppendElement(parentAsISupports);
 #ifdef NS_DEBUG
         // begin debug output
diff --git a/mozilla/editor/base/DeleteTableCellTxn.h b/mozilla/editor/base/DeleteTableCellTxn.h
index a407b0b64c9..8d07de7b93e 100644
--- a/mozilla/editor/base/DeleteTableCellTxn.h
+++ b/mozilla/editor/base/DeleteTableCellTxn.h
@@ -76,7 +76,7 @@ public:
   // override QueryInterface to handle DeleteTableCellTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = DELETE_CELL_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = DELETE_CELL_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/DeleteTableColumnTxn.h b/mozilla/editor/base/DeleteTableColumnTxn.h
index 88ed3a236c1..5ee91e8f9a7 100644
--- a/mozilla/editor/base/DeleteTableColumnTxn.h
+++ b/mozilla/editor/base/DeleteTableColumnTxn.h
@@ -76,7 +76,7 @@ public:
   // override QueryInterface to handle DeleteTableColumnTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = DELETE_COLUMN_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = DELETE_COLUMN_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/DeleteTableRowTxn.h b/mozilla/editor/base/DeleteTableRowTxn.h
index c9ed6d347bc..6afd3f95de8 100644
--- a/mozilla/editor/base/DeleteTableRowTxn.h
+++ b/mozilla/editor/base/DeleteTableRowTxn.h
@@ -77,7 +77,7 @@ public:
   // override QueryInterface to handle DeleteTableRowTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = DELETE_ROW_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = DELETE_ROW_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/DeleteTableTxn.h b/mozilla/editor/base/DeleteTableTxn.h
index e1b81880db1..59e50e30f02 100644
--- a/mozilla/editor/base/DeleteTableTxn.h
+++ b/mozilla/editor/base/DeleteTableTxn.h
@@ -76,7 +76,7 @@ public:
   // override QueryInterface to handle DeleteTableTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = DELETE_TABLE_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = DELETE_TABLE_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/EditTable.cpp b/mozilla/editor/base/EditTable.cpp
index f91767dfcf0..57ee3350986 100644
--- a/mozilla/editor/base/EditTable.cpp
+++ b/mozilla/editor/base/EditTable.cpp
@@ -285,7 +285,7 @@ NS_IMETHODIMP nsHTMLEditor::GetColIndexForCell(nsIDOMNode *aCellNode, PRInt32 &a
     if ((NS_SUCCEEDED(result)) && (nsnull!=layoutObject))
     { // get the table cell interface from the frame
       nsITableCellLayout *cellLayoutObject=nsnull; // again, frames are not ref-counted
-      result = layoutObject->QueryInterface(nsITableCellLayout::IID(), (void**)(&cellLayoutObject));
+      result = layoutObject->QueryInterface(nsITableCellLayout::GetIID(), (void**)(&cellLayoutObject));
       if ((NS_SUCCEEDED(result)) && (nsnull!=cellLayoutObject))
       { // get the index
         result = cellLayoutObject->GetColIndex(aCellIndex);
diff --git a/mozilla/editor/base/InsertTableCellTxn.h b/mozilla/editor/base/InsertTableCellTxn.h
index 339f2bcf0a1..c8055468e35 100644
--- a/mozilla/editor/base/InsertTableCellTxn.h
+++ b/mozilla/editor/base/InsertTableCellTxn.h
@@ -78,7 +78,7 @@ public:
   // override QueryInterface to handle InsertTableCellTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_CELL_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_CELL_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/InsertTableColumnTxn.h b/mozilla/editor/base/InsertTableColumnTxn.h
index 86a62c2abed..5fb712558e7 100644
--- a/mozilla/editor/base/InsertTableColumnTxn.h
+++ b/mozilla/editor/base/InsertTableColumnTxn.h
@@ -79,7 +79,7 @@ public:
   // override QueryInterface to handle InsertTableColumnTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_COLUMN_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_COLUMN_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/InsertTableRowTxn.h b/mozilla/editor/base/InsertTableRowTxn.h
index 631a525882f..d6c1ae6c672 100644
--- a/mozilla/editor/base/InsertTableRowTxn.h
+++ b/mozilla/editor/base/InsertTableRowTxn.h
@@ -79,7 +79,7 @@ public:
   // override QueryInterface to handle InsertTableRowTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_ROW_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_ROW_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/InsertTableTxn.h b/mozilla/editor/base/InsertTableTxn.h
index a3feee3f5b4..62e07945ce4 100644
--- a/mozilla/editor/base/InsertTableTxn.h
+++ b/mozilla/editor/base/InsertTableTxn.h
@@ -78,7 +78,7 @@ public:
   // override QueryInterface to handle InsertTableTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_TABLE_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_TABLE_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/InsertTextTxn.h b/mozilla/editor/base/InsertTextTxn.h
index 32215f623e5..ceb0f95d3f7 100644
--- a/mozilla/editor/base/InsertTextTxn.h
+++ b/mozilla/editor/base/InsertTextTxn.h
@@ -76,7 +76,7 @@ public:
   // override QueryInterface to handle InsertTextTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_TEXT_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_TEXT_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/JoinTableCellsTxn.h b/mozilla/editor/base/JoinTableCellsTxn.h
index 80dca52f9b7..f4e0291ee35 100644
--- a/mozilla/editor/base/JoinTableCellsTxn.h
+++ b/mozilla/editor/base/JoinTableCellsTxn.h
@@ -75,7 +75,7 @@ public:
   // override QueryInterface to handle JoinTableCellsTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = JOIN_CELLS_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = JOIN_CELLS_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp
index a1139dc5d58..44bd59c5d84 100644
--- a/mozilla/editor/base/nsEditor.cpp
+++ b/mozilla/editor/base/nsEditor.cpp
@@ -1705,7 +1705,7 @@ NS_IMETHODIMP GetColIndexForCell(nsIPresShell *aPresShell, nsIDOMNode *aCellNode
       if ((NS_SUCCEEDED(result)) && (nsnull!=layoutObject))
       { // get the table cell interface from the frame
         nsITableCellLayout *cellLayoutObject=nsnull; // again, frames are not ref-counted
-        result = layoutObject->QueryInterface(nsITableCellLayout::IID(), (void**)(&cellLayoutObject));
+        result = layoutObject->QueryInterface(nsITableCellLayout::GetIID(), (void**)(&cellLayoutObject));
         if ((NS_SUCCEEDED(result)) && (nsnull!=cellLayoutObject))
         { // get the index
           result = cellLayoutObject->GetColIndex(aCellIndex);
diff --git a/mozilla/editor/base/nsIEditProperty.h b/mozilla/editor/base/nsIEditProperty.h
index 14acc0d48c9..cf21b7ad0bb 100644
--- a/mozilla/editor/base/nsIEditProperty.h
+++ b/mozilla/editor/base/nsIEditProperty.h
@@ -35,7 +35,7 @@ class nsIAtom;
 class nsIEditProperty : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IEDITPROPERTY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IEDITPROPERTY_IID; return iid; }
 
   NS_IMETHOD Init(nsIAtom *aPropName, nsIAtom *aValue, PRBool aAppliesToAll)=0;
   NS_IMETHOD GetProperty(nsIAtom **aProperty) const =0;  
diff --git a/mozilla/editor/base/nsIEditorSupport.h b/mozilla/editor/base/nsIEditorSupport.h
index 6213e2efba8..2de294550ad 100644
--- a/mozilla/editor/base/nsIEditorSupport.h
+++ b/mozilla/editor/base/nsIEditorSupport.h
@@ -38,7 +38,7 @@ class nsIEditorSupport  : public nsISupports {
 
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_IEDITORSUPPORT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IEDITORSUPPORT_IID; return iid; }
 
   /** 
    * SplitNode() creates a new node identical to an existing node, and split the contents between the two nodes
diff --git a/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp b/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
index 159ac039a54..5c7bb8e8119 100644
--- a/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
+++ b/mozilla/editor/libeditor/base/DeleteRangeTxn.cpp
@@ -395,7 +395,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommon
         // test if child is an ancestor of the other node.  If it is, don't process this parent anymore
         PRInt32 index;
         nsISupports *childAsISupports;
-        child->QueryInterface(nsISupports::IID(), (void **)&childAsISupports);
+        child->QueryInterface(nsISupports::GetIID(), (void **)&childAsISupports);
         index = ancestorList->IndexOf(childAsISupports);
         if (-1!=index)
           break;
@@ -521,7 +521,7 @@ NS_IMETHODIMP DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsAr
     while ((NS_SUCCEEDED(result)) && child && parent)
     {
       nsISupports * parentAsISupports;
-      parent->QueryInterface(nsISupports::IID(), (void **)&parentAsISupports);
+      parent->QueryInterface(nsISupports::GetIID(), (void **)&parentAsISupports);
       aList->AppendElement(parentAsISupports);
 #ifdef NS_DEBUG
         // begin debug output
diff --git a/mozilla/editor/libeditor/base/InsertTextTxn.h b/mozilla/editor/libeditor/base/InsertTextTxn.h
index 32215f623e5..ceb0f95d3f7 100644
--- a/mozilla/editor/libeditor/base/InsertTextTxn.h
+++ b/mozilla/editor/libeditor/base/InsertTextTxn.h
@@ -76,7 +76,7 @@ public:
   // override QueryInterface to handle InsertTextTxn request
   NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr);
 
-  static const nsIID& IID() { static nsIID iid = INSERT_TEXT_TXN_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = INSERT_TEXT_TXN_IID; return iid; }
 
 
   /** return the string data associated with this transaction */
diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index a1139dc5d58..44bd59c5d84 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -1705,7 +1705,7 @@ NS_IMETHODIMP GetColIndexForCell(nsIPresShell *aPresShell, nsIDOMNode *aCellNode
       if ((NS_SUCCEEDED(result)) && (nsnull!=layoutObject))
       { // get the table cell interface from the frame
         nsITableCellLayout *cellLayoutObject=nsnull; // again, frames are not ref-counted
-        result = layoutObject->QueryInterface(nsITableCellLayout::IID(), (void**)(&cellLayoutObject));
+        result = layoutObject->QueryInterface(nsITableCellLayout::GetIID(), (void**)(&cellLayoutObject));
         if ((NS_SUCCEEDED(result)) && (nsnull!=cellLayoutObject))
         { // get the index
           result = cellLayoutObject->GetColIndex(aCellIndex);
diff --git a/mozilla/editor/libeditor/base/nsIEditProperty.h b/mozilla/editor/libeditor/base/nsIEditProperty.h
index 14acc0d48c9..cf21b7ad0bb 100644
--- a/mozilla/editor/libeditor/base/nsIEditProperty.h
+++ b/mozilla/editor/libeditor/base/nsIEditProperty.h
@@ -35,7 +35,7 @@ class nsIAtom;
 class nsIEditProperty : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IEDITPROPERTY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IEDITPROPERTY_IID; return iid; }
 
   NS_IMETHOD Init(nsIAtom *aPropName, nsIAtom *aValue, PRBool aAppliesToAll)=0;
   NS_IMETHOD GetProperty(nsIAtom **aProperty) const =0;  
diff --git a/mozilla/editor/libeditor/base/nsIEditorSupport.h b/mozilla/editor/libeditor/base/nsIEditorSupport.h
index 6213e2efba8..2de294550ad 100644
--- a/mozilla/editor/libeditor/base/nsIEditorSupport.h
+++ b/mozilla/editor/libeditor/base/nsIEditorSupport.h
@@ -38,7 +38,7 @@ class nsIEditorSupport  : public nsISupports {
 
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_IEDITORSUPPORT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IEDITORSUPPORT_IID; return iid; }
 
   /** 
    * SplitNode() creates a new node identical to an existing node, and split the contents between the two nodes
diff --git a/mozilla/editor/public/nsIContextLoader.h b/mozilla/editor/public/nsIContextLoader.h
index 9dcb5dfe979..205cd40d953 100644
--- a/mozilla/editor/public/nsIContextLoader.h
+++ b/mozilla/editor/public/nsIContextLoader.h
@@ -44,7 +44,7 @@
 class nsIContextLoader  : public nsISupports{
  public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ICONTEXTLOADER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTEXTLOADER_IID; return iid; }
 
   /**
    * Lookup(PRUint32 aIndex1, PRUint32 aIndex2, PRUint32 **aResult)
diff --git a/mozilla/editor/public/nsIEditor.h b/mozilla/editor/public/nsIEditor.h
index 9f9cb9c0e66..443f7b83fb5 100644
--- a/mozilla/editor/public/nsIEditor.h
+++ b/mozilla/editor/public/nsIEditor.h
@@ -68,7 +68,7 @@ public:
 
   typedef enum {eLTR=0, eRTL=1} Direction;
 
-  static const nsIID& IID() { static nsIID iid = NS_IEDITOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IEDITOR_IID; return iid; }
 
   /**
    * Init tells is to tell the implementation of nsIEditor to begin its services
diff --git a/mozilla/editor/public/nsIHTMLEditor.h b/mozilla/editor/public/nsIHTMLEditor.h
index d611bdd8519..9f085b267dd 100644
--- a/mozilla/editor/public/nsIHTMLEditor.h
+++ b/mozilla/editor/public/nsIHTMLEditor.h
@@ -41,7 +41,7 @@ class nsIOutputStream;
  */
 class nsIHTMLEditor  : public nsISupports{
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IHTMLEDITOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IHTMLEDITOR_IID; return iid; }
 
   /** Initialize the text editor 
     *
diff --git a/mozilla/editor/public/nsITextEditor.h b/mozilla/editor/public/nsITextEditor.h
index e38c8566ad7..657d9634f59 100644
--- a/mozilla/editor/public/nsITextEditor.h
+++ b/mozilla/editor/public/nsITextEditor.h
@@ -48,7 +48,7 @@ public:
   typedef enum {ePlainText=0, eRichText=1} TextType;
   typedef enum {eSingleLine=0, eMultipleLines=1, ePassword=2} EditorType;
 
-  static const nsIID& IID() { static nsIID iid = NS_ITEXTEDITOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITEXTEDITOR_IID; return iid; }
 
   /** Initialize the text editor 
     *
diff --git a/mozilla/editor/txmgr/public/nsITransaction.h b/mozilla/editor/txmgr/public/nsITransaction.h
index e67bea4eb64..61a0134fb04 100644
--- a/mozilla/editor/txmgr/public/nsITransaction.h
+++ b/mozilla/editor/txmgr/public/nsITransaction.h
@@ -42,7 +42,7 @@ Transaction interface to outside world
 class nsITransaction  : public nsISupports{
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ITRANSACTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITRANSACTION_IID; return iid; }
 
   /**
    * Executes the transaction.
diff --git a/mozilla/editor/txmgr/public/nsITransactionListener.h b/mozilla/editor/txmgr/public/nsITransactionListener.h
index e928afbe860..278fdd2127a 100644
--- a/mozilla/editor/txmgr/public/nsITransactionListener.h
+++ b/mozilla/editor/txmgr/public/nsITransactionListener.h
@@ -42,7 +42,7 @@ Transaction Listener interface to outside world
 class nsITransactionListener : public nsISupports {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ITRANSACTIONLISTENER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITRANSACTIONLISTENER_IID; return iid; }
 
   /**
    * Called when a transaction manager is doing a transaction.
diff --git a/mozilla/editor/txmgr/public/nsITransactionManager.h b/mozilla/editor/txmgr/public/nsITransactionManager.h
index 36b3ae7806a..41392cf81bf 100644
--- a/mozilla/editor/txmgr/public/nsITransactionManager.h
+++ b/mozilla/editor/txmgr/public/nsITransactionManager.h
@@ -42,7 +42,7 @@ Transaction Manager interface to outside world
 class nsITransactionManager  : public nsISupports{
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ITRANSACTIONMANAGER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITRANSACTIONMANAGER_IID; return iid; }
 
   /**
    * Calls a transaction's Do() method, then pushes it on the undo stack.
diff --git a/mozilla/gfx/public/nsIDeviceContext.h b/mozilla/gfx/public/nsIDeviceContext.h
index 3417b22bdaf..fcb546b9432 100644
--- a/mozilla/gfx/public/nsIDeviceContext.h
+++ b/mozilla/gfx/public/nsIDeviceContext.h
@@ -110,7 +110,7 @@ typedef NI_ColorSpace IL_ColorSpace;
 class nsIDeviceContext : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDEVICE_CONTEXT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDEVICE_CONTEXT_IID; return iid; }
 
   /**
    * Initialize the device context from a widget
diff --git a/mozilla/gfx/public/nsIFontMetrics.h b/mozilla/gfx/public/nsIFontMetrics.h
index 8fe1fc199ed..29c4b79e605 100644
--- a/mozilla/gfx/public/nsIFontMetrics.h
+++ b/mozilla/gfx/public/nsIFontMetrics.h
@@ -46,7 +46,7 @@ class nsIFontMetrics : public nsISupports
   // XXX what about encoding, where do we put that? MMP
 
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFONT_METRICS_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFONT_METRICS_IID; return iid; }
 
   /**
    * Initialize the font metrics. Call this after creating the font metrics.
diff --git a/mozilla/gfx/public/nsIImageRequest.h b/mozilla/gfx/public/nsIImageRequest.h
index ba4bc5edf07..0f4fadd4e7f 100644
--- a/mozilla/gfx/public/nsIImageRequest.h
+++ b/mozilla/gfx/public/nsIImageRequest.h
@@ -39,7 +39,7 @@ class nsIImage;
  */
 class nsIImageRequest : public nsISupports {
 public:  
-  static const nsIID& IID() { static nsIID iid = NS_IIMAGEREQUEST_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IIMAGEREQUEST_IID; return iid; }
 
   /// @return the image object associated with the request.
   virtual nsIImage* GetImage() = 0;
diff --git a/mozilla/gfx/public/nsIRenderingContext.h b/mozilla/gfx/public/nsIRenderingContext.h
index 06eb067aee6..da566a0abc0 100644
--- a/mozilla/gfx/public/nsIRenderingContext.h
+++ b/mozilla/gfx/public/nsIRenderingContext.h
@@ -69,7 +69,7 @@ typedef void * nsDrawingSurface;
 class nsIRenderingContext : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IRENDERING_CONTEXT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IRENDERING_CONTEXT_IID; return iid; }
 
   //TBD: bind/unbind, transformation of scalars (hacky), 
   //potential drawmode for selection, polygons. MMP
diff --git a/mozilla/js/src/xpconnect/nsIXPConnect.h b/mozilla/js/src/xpconnect/nsIXPConnect.h
index 4ad11a40d98..2670d569a34 100644
--- a/mozilla/js/src/xpconnect/nsIXPConnect.h
+++ b/mozilla/js/src/xpconnect/nsIXPConnect.h
@@ -85,7 +85,7 @@ class nsIXPConnectWrappedJS : public nsISupports
     // To manipulate this wrapper (as opposed to manipulating the wrapped
     // JSObject via this wrapper) do a QueryInterface for the
     // nsIXPConnectWrappedJSMethods interface 
-    // i.e. 'nsIXPConnectWrappedJSMethods::IID()'
+    // i.e. 'nsIXPConnectWrappedJSMethods::GetIID()'
     // and use the methods on that interface. (see below)
 };
 
diff --git a/mozilla/js/src/xpconnect/nsXPConnect.cpp b/mozilla/js/src/xpconnect/nsXPConnect.cpp
index af203978355..6c0781348a7 100644
--- a/mozilla/js/src/xpconnect/nsXPConnect.cpp
+++ b/mozilla/js/src/xpconnect/nsXPConnect.cpp
@@ -371,34 +371,34 @@ XPC_Dump(nsISupports* p, int depth)
     nsIXPConnectWrappedNative* wn;
     nsIXPConnectWrappedJSMethods* wjsm;
 
-    if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnect::IID(),(void**)&xpc)))
+    if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnect::GetIID(),(void**)&xpc)))
     {
         XPC_LOG_ALWAYS(("Dumping a nsIXPConnect..."));
         xpc->DebugDump(depth);
         NS_RELEASE(xpc);
     }
-    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPCWrappedNativeClass::IID(),
+    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPCWrappedNativeClass::GetIID(),
                         (void**)&wnc)))
     {
         XPC_LOG_ALWAYS(("Dumping a nsIXPCWrappedNativeClass..."));
         wnc->DebugDump(depth);
         NS_RELEASE(wnc);
     }
-    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPCWrappedJSClass::IID(),
+    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPCWrappedJSClass::GetIID(),
                         (void**)&wjsc)))
     {
         XPC_LOG_ALWAYS(("Dumping a nsIXPCWrappedJSClass..."));
         wjsc->DebugDump(depth);
         NS_RELEASE(wjsc);
     }
-    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnectWrappedNative::IID(),
+    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnectWrappedNative::GetIID(),
                         (void**)&wn)))
     {
         XPC_LOG_ALWAYS(("Dumping a nsIXPConnectWrappedNative..."));
         wn->DebugDump(depth);
         NS_RELEASE(wn);
     }
-    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnectWrappedJSMethods::IID(),
+    else if(NS_SUCCEEDED(p->QueryInterface(nsIXPConnectWrappedJSMethods::GetIID(),
                         (void**)&wjsm)))
     {
         XPC_LOG_ALWAYS(("Dumping a nsIXPConnectWrappedJSMethods..."));
diff --git a/mozilla/js/src/xpconnect/test/TestXPC.cpp b/mozilla/js/src/xpconnect/test/TestXPC.cpp
index 86e9cf7ffef..19af1e8d02c 100644
--- a/mozilla/js/src/xpconnect/test/TestXPC.cpp
+++ b/mozilla/js/src/xpconnect/test/TestXPC.cpp
@@ -118,14 +118,14 @@ NS_IMETHODIMP nsTestXPCFoo::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 
   *aInstancePtr = NULL;
 
-  if (aIID.Equals(nsITestXPCFoo::IID()) || 
-      aIID.Equals(nsITestXPCFoo2::IID()) ||
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsITestXPCFoo::GetIID()) || 
+      aIID.Equals(nsITestXPCFoo2::GetIID()) ||
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsIXPCScriptable::IID())) {
+  if (aIID.Equals(nsIXPCScriptable::GetIID())) {
     *aInstancePtr = (void*) new MyScriptable();
     return NS_OK;
   }
@@ -481,19 +481,19 @@ int main()
     nsIXPConnectWrappedNative* fool_wrapper = NULL;
 
 /*
-    if(NS_SUCCEEDED(xpc->WrapNative(jscontext, foo, nsITestXPCFoo::IID(), &wrapper)))
+    if(NS_SUCCEEDED(xpc->WrapNative(jscontext, foo, nsITestXPCFoo::GetIID(), &wrapper)))
 */
     // new code where global object is a wrapped xpcom object
     if(NS_SUCCEEDED(xpc->InitJSContextWithNewWrappedGlobal(
-                                    jscontext, foo, nsITestXPCFoo::IID(), &wrapper)))
+                                    jscontext, foo, nsITestXPCFoo::GetIID(), &wrapper)))
     {
         wrapper->GetJSObject(&glob);
         JS_DefineFunctions(jscontext, glob, glob_functions);
 
         nsTestXPCFoo* fool = new nsTestXPCFoo();
-        xpc->WrapNative(jscontext, fool, nsITestXPCFoo2::IID(), &fool_wrapper);
+        xpc->WrapNative(jscontext, fool, nsITestXPCFoo2::GetIID(), &fool_wrapper);
 
-        if(NS_SUCCEEDED(xpc->WrapNative(jscontext, foo, nsITestXPCFoo2::IID(), &wrapper2)))
+        if(NS_SUCCEEDED(xpc->WrapNative(jscontext, foo, nsITestXPCFoo2::GetIID(), &wrapper2)))
         {
             JSObject* js_obj;
             nsISupports* com_obj;
@@ -511,7 +511,7 @@ int main()
             JSObject* echo_jsobj;
             jsval echo_jsval;
             MyEcho* myEcho = new MyEcho();
-            xpc->WrapNative(jscontext, myEcho, nsIEcho::IID(), &echo_wrapper);
+            xpc->WrapNative(jscontext, myEcho, nsIEcho::GetIID(), &echo_wrapper);
             echo_wrapper->GetJSObject(&echo_jsobj);
             echo_jsval = OBJECT_TO_JSVAL(echo_jsobj);
             JS_SetProperty(jscontext, glob, "echo", &echo_jsval);
@@ -530,7 +530,7 @@ int main()
                 nsIXPConnectWrappedJS* wrapper3;
                 if(NS_SUCCEEDED(xpc->WrapJS(jscontext,
                                        JSVAL_TO_OBJECT(v),
-                                       nsITestXPCFoo::IID(), &wrapper3)))
+                                       nsITestXPCFoo::GetIID(), &wrapper3)))
                 {
                     nsITestXPCFoo* ptr = (nsITestXPCFoo*)wrapper3;
                     int result;
@@ -540,7 +540,7 @@ int main()
     
                     nsIXPConnectWrappedJSMethods* methods;
 
-                    wrapper3->QueryInterface(nsIXPConnectWrappedJSMethods::IID(), 
+                    wrapper3->QueryInterface(nsIXPConnectWrappedJSMethods::GetIID(), 
                                             (void**) &methods);
                     methods->GetJSObject(&test_js_obj);
 
diff --git a/mozilla/js/src/xpconnect/xpcconvert.cpp b/mozilla/js/src/xpconnect/xpcconvert.cpp
index b13f929a63d..232e4d9a62d 100644
--- a/mozilla/js/src/xpconnect/xpcconvert.cpp
+++ b/mozilla/js/src/xpconnect/xpcconvert.cpp
@@ -220,7 +220,7 @@ XPCConvert::NativeData2JS(JSContext* cx, jsval* d, const void* s,
                 {
                     nsIXPConnectWrappedJSMethods* methods;
                     if(NS_SUCCEEDED(iface->QueryInterface(
-                                nsIXPConnectWrappedJSMethods::IID(),
+                                nsIXPConnectWrappedJSMethods::GetIID(),
                                 (void**)&methods)) &&
                        NS_SUCCEEDED(methods->GetJSObject(&aJSObj)))
                     {
diff --git a/mozilla/js/src/xpconnect/xpcwrappedjs.cpp b/mozilla/js/src/xpconnect/xpcwrappedjs.cpp
index 4e1384e6389..19cb008fd34 100644
--- a/mozilla/js/src/xpconnect/xpcwrappedjs.cpp
+++ b/mozilla/js/src/xpconnect/xpcwrappedjs.cpp
@@ -31,7 +31,7 @@ nsXPCWrappedJS::QueryInterface(REFNSIID aIID, void** aInstancePtr)
         return NS_ERROR_NULL_POINTER;
     }
 
-    if(aIID.Equals(nsIXPConnectWrappedJSMethods::IID()))
+    if(aIID.Equals(nsIXPConnectWrappedJSMethods::GetIID()))
     {
         if(!mMethods && !(mMethods = new nsXPCWrappedJSMethods(this)))
         {
@@ -140,7 +140,7 @@ nsXPCWrappedJS::GetNewOrUsedWrapper(XPCContext* xpcc,
             // just a root wrapper
             nsXPCWrappedJSClass* rootClazz;
             rootClazz = nsXPCWrappedJSClass::GetNewOrUsedClass(
-                                                    xpcc, nsISupports::IID());
+                                                    xpcc, nsISupports::GetIID());
             if(!rootClazz)
                 goto return_wrapper;
 
@@ -217,7 +217,7 @@ nsXPCWrappedJS::~nsXPCWrappedJS()
 nsXPCWrappedJS*
 nsXPCWrappedJS::Find(REFNSIID aIID)
 {
-    if(aIID.Equals(nsISupports::IID()))
+    if(aIID.Equals(nsISupports::GetIID()))
         return mRoot;
 
     nsXPCWrappedJS* cur = mRoot;
diff --git a/mozilla/js/src/xpconnect/xpcwrappedjsclass.cpp b/mozilla/js/src/xpconnect/xpcwrappedjsclass.cpp
index 3791e0ef265..80db7a16c24 100644
--- a/mozilla/js/src/xpconnect/xpcwrappedjsclass.cpp
+++ b/mozilla/js/src/xpconnect/xpcwrappedjsclass.cpp
@@ -207,7 +207,7 @@ nsXPCWrappedJSClass::IsWrappedJS(nsISupports* aPtr)
     void* result;
     NS_PRECONDITION(aPtr, "null pointer");
     return aPtr &&
-           NS_OK == aPtr->QueryInterface(WrappedJSIdentity::IID(), &result) &&
+           NS_OK == aPtr->QueryInterface(WrappedJSIdentity::GetIID(), &result) &&
            result == WrappedJSIdentity::GetSingleton();
 }
 
@@ -216,7 +216,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
                                              REFNSIID aIID,
                                              void** aInstancePtr)
 {
-    if(aIID.Equals(nsISupports::IID()))
+    if(aIID.Equals(nsISupports::GetIID()))
     {
         nsXPCWrappedJS* root = self->GetRootWrapper();
         *aInstancePtr = (void*) root;
@@ -229,7 +229,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
         NS_ADDREF(self);
         return NS_OK;
     }
-    else if(aIID.Equals(WrappedJSIdentity::IID()))
+    else if(aIID.Equals(WrappedJSIdentity::GetIID()))
     {
         *aInstancePtr = WrappedJSIdentity::GetSingleton();
         return NS_OK;
@@ -258,7 +258,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self,
 JSObject*
 nsXPCWrappedJSClass::GetRootJSObject(JSObject* aJSObj)
 {
-    JSObject* result = CallQueryInterfaceOnJSObject(aJSObj, nsISupports::IID());
+    JSObject* result = CallQueryInterfaceOnJSObject(aJSObj, nsISupports::GetIID());
     return result ? result : aJSObj;
 }
 
diff --git a/mozilla/js/src/xpconnect/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/xpcwrappednative.cpp
index 2230c02a291..d9f12ff54ce 100644
--- a/mozilla/js/src/xpconnect/xpcwrappednative.cpp
+++ b/mozilla/js/src/xpconnect/xpcwrappednative.cpp
@@ -106,7 +106,7 @@ nsXPCWrappedNative::GetNewOrUsedWrapper(XPCContext* xpcc,
     }
 
     // always find the native root
-    if(NS_FAILED(aObj->QueryInterface(nsISupports::IID(), (void**)&rootObj)))
+    if(NS_FAILED(aObj->QueryInterface(nsISupports::GetIID(), (void**)&rootObj)))
         return NULL;
 
     // look for the root wrapper
@@ -149,7 +149,7 @@ nsXPCWrappedNative::GetNewOrUsedWrapper(XPCContext* xpcc,
             // just a root wrapper
             nsXPCWrappedNativeClass* rootClazz;
             rootClazz = nsXPCWrappedNativeClass::GetNewOrUsedClass(
-                                                    xpcc, nsISupports::IID());
+                                                    xpcc, nsISupports::GetIID());
             if(!rootClazz)
                 goto return_wrapper;
 
@@ -219,7 +219,7 @@ nsXPCWrappedNative::nsXPCWrappedNative(nsISupports* aObj,
     if(mRoot == this)
     {
         nsIXPCScriptable* ds;
-        if(NS_SUCCEEDED(mObj->QueryInterface(nsIXPCScriptable::IID(),
+        if(NS_SUCCEEDED(mObj->QueryInterface(nsIXPCScriptable::GetIID(),
                                              (void**)&ds)))
             mDynamicScriptable = ds;
     }
@@ -262,7 +262,7 @@ nsXPCWrappedNative::~nsXPCWrappedNative()
 nsXPCWrappedNative*
 nsXPCWrappedNative::Find(REFNSIID aIID)
 {
-    if(aIID.Equals(nsISupports::IID()))
+    if(aIID.Equals(nsISupports::GetIID()))
         return mRoot;
 
     nsXPCWrappedNative* cur = mRoot;
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index fc8a875f485..07c332f377e 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -3764,7 +3764,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
   // the style tag has its own interpretation based on aHint 
   if (NS_STYLE_HINT_UNKNOWN == aHint) { 
     nsIStyledContent* styledContent;
-    result = aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent);
+    result = aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent);
 
     if (NS_OK == result) { 
       // Get style hint from HTML content object. 
diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp
index a6ef3d9ecaf..eb395376099 100644
--- a/mozilla/layout/base/nsCaret.cpp
+++ b/mozilla/layout/base/nsCaret.cpp
@@ -116,12 +116,12 @@ nsresult nsCaret::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsICaret::IID())) {
+  if (aIID.Equals(nsICaret::GetIID())) {
     *aInstancePtrResult = (void*)(nsICaret*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsIDOMSelectionListener::IID())) {
+  if (aIID.Equals(nsIDOMSelectionListener::GetIID())) {
     *aInstancePtrResult = (void*)(nsIDOMSelectionListener*)this;
     NS_ADDREF_THIS();
     return NS_OK;
diff --git a/mozilla/layout/base/nsICaret.h b/mozilla/layout/base/nsICaret.h
index 5a75d08d30d..244010ae549 100644
--- a/mozilla/layout/base/nsICaret.h
+++ b/mozilla/layout/base/nsICaret.h
@@ -27,7 +27,7 @@ class nsCaretProperties;
 class nsICaret: public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICARET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICARET_IID; return iid; }
 
   NS_IMETHOD Init(nsIPresShell *inPresShell, nsCaretProperties *inCaretProperties) = 0;
   
diff --git a/mozilla/layout/base/nsIFrameSelection.h b/mozilla/layout/base/nsIFrameSelection.h
index 982801db793..01dde9700d8 100644
--- a/mozilla/layout/base/nsIFrameSelection.h
+++ b/mozilla/layout/base/nsIFrameSelection.h
@@ -40,7 +40,7 @@
 // Selection interface
 class nsIFrameSelection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFRAMESELECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFRAMESELECTION_IID; return iid; }
 
   /** HandleKeyEvent will accept an event and frame and 
    *  will return NS_OK if it handles the event or NS_COMFALSE if not.
diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h
index b5d7c2f9d11..076e2ba029d 100644
--- a/mozilla/layout/base/nsIPresShell.h
+++ b/mozilla/layout/base/nsIPresShell.h
@@ -64,7 +64,7 @@ class nsISelectionMgr;
  */
 class nsIPresShell : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IPRESSHELL_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IPRESSHELL_IID; return iid; }
 
   NS_IMETHOD Init(nsIDocument* aDocument,
                   nsIPresContext* aPresContext,
diff --git a/mozilla/layout/base/public/nsICaret.h b/mozilla/layout/base/public/nsICaret.h
index 5a75d08d30d..244010ae549 100644
--- a/mozilla/layout/base/public/nsICaret.h
+++ b/mozilla/layout/base/public/nsICaret.h
@@ -27,7 +27,7 @@ class nsCaretProperties;
 class nsICaret: public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICARET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICARET_IID; return iid; }
 
   NS_IMETHOD Init(nsIPresShell *inPresShell, nsCaretProperties *inCaretProperties) = 0;
   
diff --git a/mozilla/layout/base/public/nsIContent.h b/mozilla/layout/base/public/nsIContent.h
index bb140626cd3..b6714a6dc1f 100644
--- a/mozilla/layout/base/public/nsIContent.h
+++ b/mozilla/layout/base/public/nsIContent.h
@@ -47,7 +47,7 @@ class nsIDOMRange;
 // is supported by all content objects.
 class nsIContent : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENT_IID; return iid; }
 
   NS_IMETHOD GetDocument(nsIDocument*& aResult) const = 0;
 
diff --git a/mozilla/layout/base/public/nsIContentIterator.h b/mozilla/layout/base/public/nsIContentIterator.h
index 5e1740b7040..a074e5aac27 100644
--- a/mozilla/layout/base/public/nsIContentIterator.h
+++ b/mozilla/layout/base/public/nsIContentIterator.h
@@ -31,7 +31,7 @@ class nsIDOMRange;
 class nsIContentIterator : public nsISupports {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ICONTENTITERTOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENTITERTOR_IID; return iid; }
 
   /* Initializes an iterator for the subtree rooted by the node aRoot
    */
diff --git a/mozilla/layout/base/public/nsIDOMSelection.h b/mozilla/layout/base/public/nsIDOMSelection.h
index 16c697312a6..64c95fed196 100644
--- a/mozilla/layout/base/public/nsIDOMSelection.h
+++ b/mozilla/layout/base/public/nsIDOMSelection.h
@@ -39,7 +39,7 @@ class nsIDOMSelectionListener;
 // Selection interface
 class nsIDOMSelection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSELECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSELECTION_IID; return iid; }
 
   /*
    * Get the node and offset for the anchor point
diff --git a/mozilla/layout/base/public/nsIDOMSelectionListener.h b/mozilla/layout/base/public/nsIDOMSelectionListener.h
index 24b264a267f..85ea3c1c463 100644
--- a/mozilla/layout/base/public/nsIDOMSelectionListener.h
+++ b/mozilla/layout/base/public/nsIDOMSelectionListener.h
@@ -42,7 +42,7 @@
 class nsIDOMSelectionListener : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSELECTIONLISTENER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSELECTIONLISTENER_IID; return iid; }
 
   NS_IMETHOD NotifySelectionChanged() = 0;
   
diff --git a/mozilla/layout/base/public/nsIFocusTracker.h b/mozilla/layout/base/public/nsIFocusTracker.h
index c748808fa73..ebe57bc128e 100644
--- a/mozilla/layout/base/public/nsIFocusTracker.h
+++ b/mozilla/layout/base/public/nsIFocusTracker.h
@@ -30,7 +30,7 @@
 class nsIFocusTracker : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFOCUSTRACKER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFOCUSTRACKER_IID; return iid; }
 
   /** SetFocus will keep track of the new frame as the focus frame. 
    *  as well as keeping track of the anchor frame; <BR>
diff --git a/mozilla/layout/base/public/nsIFrameSelection.h b/mozilla/layout/base/public/nsIFrameSelection.h
index 982801db793..01dde9700d8 100644
--- a/mozilla/layout/base/public/nsIFrameSelection.h
+++ b/mozilla/layout/base/public/nsIFrameSelection.h
@@ -40,7 +40,7 @@
 // Selection interface
 class nsIFrameSelection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFRAMESELECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFRAMESELECTION_IID; return iid; }
 
   /** HandleKeyEvent will accept an event and frame and 
    *  will return NS_OK if it handles the event or NS_COMFALSE if not.
diff --git a/mozilla/layout/base/public/nsIPresShell.h b/mozilla/layout/base/public/nsIPresShell.h
index b5d7c2f9d11..076e2ba029d 100644
--- a/mozilla/layout/base/public/nsIPresShell.h
+++ b/mozilla/layout/base/public/nsIPresShell.h
@@ -64,7 +64,7 @@ class nsISelectionMgr;
  */
 class nsIPresShell : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IPRESSHELL_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IPRESSHELL_IID; return iid; }
 
   NS_IMETHOD Init(nsIDocument* aDocument,
                   nsIPresContext* aPresContext,
diff --git a/mozilla/layout/base/public/nsISelection.h b/mozilla/layout/base/public/nsISelection.h
index 540b5ede920..effe7a0822f 100644
--- a/mozilla/layout/base/public/nsISelection.h
+++ b/mozilla/layout/base/public/nsISelection.h
@@ -38,7 +38,7 @@
 // Selection interface
 class nsISelection : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISELECTION_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISELECTION_IID; return iid; }
 
   /** HandleKeyEvent will accept an event and frame and 
    *  will return NS_OK if it handles the event or NS_COMFALSE if not.
diff --git a/mozilla/layout/base/public/nsIStyleContext.h b/mozilla/layout/base/public/nsIStyleContext.h
index 780119e37a3..5f7af16d05d 100644
--- a/mozilla/layout/base/public/nsIStyleContext.h
+++ b/mozilla/layout/base/public/nsIStyleContext.h
@@ -263,7 +263,7 @@ inline nsBorderEdges::nsBorderEdges()
 
 class nsIStyleContext : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLECONTEXT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLECONTEXT_IID; return iid; }
 
   virtual PRBool    Equals(const nsIStyleContext* aOther) const = 0;
   virtual PRUint32  HashValue(void) const = 0;
diff --git a/mozilla/layout/base/public/nsIStyleRule.h b/mozilla/layout/base/public/nsIStyleRule.h
index cbb016daa43..af538ce969d 100644
--- a/mozilla/layout/base/public/nsIStyleRule.h
+++ b/mozilla/layout/base/public/nsIStyleRule.h
@@ -34,7 +34,7 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
 
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
diff --git a/mozilla/layout/base/public/nsIStyledContent.h b/mozilla/layout/base/public/nsIStyledContent.h
index fb3275385af..5521845f384 100644
--- a/mozilla/layout/base/public/nsIStyledContent.h
+++ b/mozilla/layout/base/public/nsIStyledContent.h
@@ -32,7 +32,7 @@ class nsIStyleContext;
 // the ability to specify style hints on an attribute change).
 class nsIStyledContent : public nsIContent {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLEDCONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLEDCONTENT_IID; return iid; }
 
   NS_IMETHOD GetID(nsIAtom*& aResult) const = 0;
   NS_IMETHOD GetClasses(nsVoidArray& aArray) const = 0;
diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp
index a6ef3d9ecaf..eb395376099 100644
--- a/mozilla/layout/base/src/nsCaret.cpp
+++ b/mozilla/layout/base/src/nsCaret.cpp
@@ -116,12 +116,12 @@ nsresult nsCaret::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsICaret::IID())) {
+  if (aIID.Equals(nsICaret::GetIID())) {
     *aInstancePtrResult = (void*)(nsICaret*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsIDOMSelectionListener::IID())) {
+  if (aIID.Equals(nsIDOMSelectionListener::GetIID())) {
     *aInstancePtrResult = (void*)(nsIDOMSelectionListener*)this;
     NS_ADDREF_THIS();
     return NS_OK;
diff --git a/mozilla/layout/base/src/nsContentIterator.cpp b/mozilla/layout/base/src/nsContentIterator.cpp
index be458693fd8..ff28ee787aa 100644
--- a/mozilla/layout/base/src/nsContentIterator.cpp
+++ b/mozilla/layout/base/src/nsContentIterator.cpp
@@ -105,7 +105,7 @@ nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult);
 nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult)
 {
   nsContentIterator * iter = new nsContentIterator();
-  return iter->QueryInterface(nsIContentIterator::IID(), (void**) aInstancePtrResult);
+  return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
 }
 
 
@@ -130,13 +130,13 @@ nsresult nsContentIterator::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-/*  if (aIID.Equals(nsIEnumerator::IID())) 
+/*  if (aIID.Equals(nsIEnumerator::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIEnumerator*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }  */
-  if (aIID.Equals(nsIContentIterator::IID())) 
+  if (aIID.Equals(nsIContentIterator::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIContentIterator*)this;
     NS_ADDREF_THIS();
@@ -528,7 +528,7 @@ nsresult nsContentIterator::CurrentNode(nsIContent **aNode)
     return NS_ERROR_FAILURE;
   if (mIsDone) 
     return NS_ERROR_FAILURE;
-  return mCurNode->QueryInterface(nsIContent::IID(), (void**) aNode);
+  return mCurNode->QueryInterface(nsIContent::GetIID(), (void**) aNode);
 }
 
 
@@ -591,7 +591,7 @@ nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult);
 nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult)
 {
   nsContentIterator * iter = new nsContentSubtreeIterator();
-  return iter->QueryInterface(nsIContentIterator::IID(), (void**) aInstancePtrResult);
+  return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
 }
 
 
diff --git a/mozilla/layout/base/src/nsRange.cpp b/mozilla/layout/base/src/nsRange.cpp
index f417844c16b..53220309d75 100644
--- a/mozilla/layout/base/src/nsRange.cpp
+++ b/mozilla/layout/base/src/nsRange.cpp
@@ -49,7 +49,7 @@ nsresult
 NS_NewRange(nsIDOMRange** aInstancePtrResult)
 {
   nsRange * range = new nsRange();
-  return range->QueryInterface(nsIDOMRange::IID(), (void**) aInstancePtrResult);
+  return range->QueryInterface(nsIDOMRange::GetIID(), (void**) aInstancePtrResult);
 }
 
 
@@ -280,7 +280,7 @@ nsresult nsRange::QueryInterface(const nsIID& aIID,
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsIDOMRange::IID())) 
+  if (aIID.Equals(nsIDOMRange::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsIDOMRange*)this;
     NS_ADDREF_THIS();
@@ -328,7 +328,7 @@ nsresult nsRange::AddToListOf(nsCOMPtr<nsIDOMNode> aNode)
   
   nsCOMPtr<nsIContent> cN;
 
-  nsresult res = aNode->QueryInterface(nsIContent::IID(), getter_AddRefs(cN));
+  nsresult res = aNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cN));
   if (!NS_SUCCEEDED(res)) 
     return res;
 
@@ -344,7 +344,7 @@ nsresult nsRange::RemoveFromListOf(nsCOMPtr<nsIDOMNode> aNode)
   
   nsCOMPtr<nsIContent> cN;
 
-  nsresult res = aNode->QueryInterface(nsIContent::IID(), getter_AddRefs(cN));
+  nsresult res = aNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cN));
   if (!NS_SUCCEEDED(res)) 
     return res;
 
@@ -564,11 +564,11 @@ PRInt32 nsRange::IndexOf(nsCOMPtr<nsIDOMNode> aChildNode)
     return 0;
   
   // convert node and parent to nsIContent, so that we can find the child index
-  res = parentNode->QueryInterface(nsIContent::IID(), getter_AddRefs(contentParent));
+  res = parentNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(contentParent));
   if (!NS_SUCCEEDED(res)) 
     return 0;
 
-  res = aChildNode->QueryInterface(nsIContent::IID(), getter_AddRefs(contentChild));
+  res = aChildNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(contentChild));
   if (!NS_SUCCEEDED(res)) 
     return 0;
   
@@ -615,7 +615,7 @@ PRInt32 nsRange::GetAncestorsAndOffsets(nsCOMPtr<nsIDOMNode> aNode, PRInt32 aOff
   
   // callers responsibility to make sure args are non-null and proper type
 
-  res = aNode->QueryInterface(nsIContent::IID(),getter_AddRefs(contentNode));
+  res = aNode->QueryInterface(nsIContent::GetIID(),getter_AddRefs(contentNode));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::GetAncestorsAndOffsets");
@@ -714,7 +714,7 @@ nsCOMPtr<nsIDOMNode> nsRange::CommonParent(nsCOMPtr<nsIDOMNode> aNode1, nsCOMPtr
   // or the first common ancestor from the leaf perspective
   i++;
   nsIDOMNode *node = NS_STATIC_CAST(nsIDOMNode*, array1->ElementAt(i));
-  node->QueryInterface(nsIDOMNode::IID(), getter_AddRefs(theParent));
+  node->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(theParent));
   return theParent;  
 }
 
@@ -722,7 +722,7 @@ nsresult nsRange::GetDOMNodeFromContent(nsCOMPtr<nsIContent> inContentNode, nsCO
 {
   if (!outDomNode) 
     return NS_ERROR_NULL_POINTER;
-  nsresult res = inContentNode->QueryInterface(nsIDOMNode::IID(), getter_AddRefs(*outDomNode));
+  nsresult res = inContentNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(*outDomNode));
   if (!NS_SUCCEEDED(res)) 
     return res;
   return NS_OK;
@@ -732,7 +732,7 @@ nsresult nsRange::GetContentFromDOMNode(nsCOMPtr<nsIDOMNode> inDomNode, nsCOMPtr
 {
   if (!outContentNode) 
     return NS_ERROR_NULL_POINTER;
-  nsresult res = inDomNode->QueryInterface(nsIContent::IID(), getter_AddRefs(*outContentNode));
+  nsresult res = inDomNode->QueryInterface(nsIContent::GetIID(), getter_AddRefs(*outContentNode));
   if (!NS_SUCCEEDED(res)) 
     return res;
   return NS_OK;
@@ -1018,13 +1018,13 @@ nsresult nsRange::DeleteContents()
   nsCOMPtr<nsIContent> cEnd;
   
   // get the content versions of our endpoints
-  nsresult res = mStartParent->QueryInterface(nsIContent::IID(), getter_AddRefs(cStart));
+  nsresult res = mStartParent->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cStart));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::DeleteContents");
     return NS_ERROR_UNEXPECTED;
   }
-  res = mEndParent->QueryInterface(nsIContent::IID(), getter_AddRefs(cEnd));
+  res = mEndParent->QueryInterface(nsIContent::GetIID(), getter_AddRefs(cEnd));
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::DeleteContents");
@@ -1059,7 +1059,7 @@ nsresult nsRange::DeleteContents()
     else // textnode -  offsets refer to data in node
     {
       nsCOMPtr<nsIDOMText> textNode;
-      res = mStartParent->QueryInterface(nsIDOMText::IID(), getter_AddRefs(textNode));
+      res = mStartParent->QueryInterface(nsIDOMText::GetIID(), getter_AddRefs(textNode));
       if (!NS_SUCCEEDED(res)) // if it's not a text node, punt
       {
         NS_NOTREACHED("nsRange::DeleteContents");
@@ -1130,7 +1130,7 @@ nsresult nsRange::DeleteContents()
   
   // If mStartParent is a text node, delete the text after start offset
   nsIDOMText *textNode;
-  res = mStartParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+  res = mStartParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
   if (NS_SUCCEEDED(res)) 
   {
     res = textNode->DeleteData(mStartOffset, 0xFFFFFFFF); // del to end
@@ -1139,7 +1139,7 @@ nsresult nsRange::DeleteContents()
   }
 
   // If mEndParent is a text node, delete the text before end offset
-  res = mEndParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+  res = mEndParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
   if (NS_SUCCEEDED(res)) 
   {
     res = textNode->DeleteData(0, mEndOffset); // del from start
@@ -1400,13 +1400,13 @@ nsresult nsRange::ToString(nsString& aReturn)
   aReturn.Truncate();
   
   // get the content versions of our endpoints
-  nsresult res = mStartParent->QueryInterface(nsIContent::IID(), (void**)&cStart);
+  nsresult res = mStartParent->QueryInterface(nsIContent::GetIID(), (void**)&cStart);
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::ToString");
     return NS_ERROR_UNEXPECTED;
   }
-  res = mEndParent->QueryInterface(nsIContent::IID(), (void**)&cEnd);
+  res = mEndParent->QueryInterface(nsIContent::GetIID(), (void**)&cEnd);
   if (!NS_SUCCEEDED(res)) 
   {
     NS_NOTREACHED("nsRange::ToString");
@@ -1418,7 +1418,7 @@ nsresult nsRange::ToString(nsString& aReturn)
   if (cStart == cEnd)
   {
     nsIDOMText *textNode;
-    res = mStartParent->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+    res = mStartParent->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
     if (!NS_SUCCEEDED(res)) // if it's not a text node, skip to iterator approach
     {
        goto toStringComplexLabel;
@@ -1455,7 +1455,7 @@ toStringComplexLabel:
   while (NS_COMFALSE == iter->IsDone())
   {
     nsIDOMText *textNode;
-    res = cN->QueryInterface(nsIDOMText::IID(), (void**)&textNode);
+    res = cN->QueryInterface(nsIDOMText::GetIID(), (void**)&textNode);
     if (NS_SUCCEEDED(res)) // if it's a text node, get the text
     {
       if (cN == cStart) // only include text past start offset
diff --git a/mozilla/layout/base/src/nsRangeList.cpp b/mozilla/layout/base/src/nsRangeList.cpp
index a25e3219add..b0c227defe1 100644
--- a/mozilla/layout/base/src/nsRangeList.cpp
+++ b/mozilla/layout/base/src/nsRangeList.cpp
@@ -335,7 +335,7 @@ nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     return NS_OK;
   }
   if (aIID.Equals(kIEnumeratorIID) ||
-      aIID.Equals(nsIBidirectionalEnumerator::IID())) {
+      aIID.Equals(nsIBidirectionalEnumerator::GetIID())) {
     nsIBidirectionalEnumerator* tmp = this;
     *aInstancePtr = (void*) tmp;
     NS_ADDREF_THIS();
diff --git a/mozilla/layout/html/base/src/nsIHTMLContent.h b/mozilla/layout/html/base/src/nsIHTMLContent.h
index 5c150ecb244..936780f9251 100644
--- a/mozilla/layout/html/base/src/nsIHTMLContent.h
+++ b/mozilla/layout/html/base/src/nsIHTMLContent.h
@@ -41,7 +41,7 @@ typedef void (*nsMapAttributesFunc)(nsIHTMLAttributes* aAttributes,
 // Abstract interface for all html content
 class nsIHTMLContent : public nsIStyledContent {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IHTMLCONTENT_IID; return iid; }
 
   /**
    * If this html content is a container, then compact asks it to minimize
diff --git a/mozilla/layout/html/style/public/nsICSSStyleSheet.h b/mozilla/layout/html/style/public/nsICSSStyleSheet.h
index fef9f059b4e..d982be1408b 100644
--- a/mozilla/layout/html/style/public/nsICSSStyleSheet.h
+++ b/mozilla/layout/html/style/public/nsICSSStyleSheet.h
@@ -30,7 +30,7 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
 
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index fc8a875f485..07c332f377e 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -3764,7 +3764,7 @@ nsCSSFrameConstructor::AttributeChanged(nsIPresContext* aPresContext,
   // the style tag has its own interpretation based on aHint 
   if (NS_STYLE_HINT_UNKNOWN == aHint) { 
     nsIStyledContent* styledContent;
-    result = aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent);
+    result = aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent);
 
     if (NS_OK == result) { 
       // Get style hint from HTML content object. 
diff --git a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
index c2bea3685b0..709d82e0512 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleSheet.cpp
@@ -1027,7 +1027,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
         ((nsnull != aSelector->mID) || (nsnull != aSelector->mClassList))) {  // test for ID & class match
       result = PR_FALSE;
       nsIStyledContent* styledContent;
-      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
         nsIAtom* contentID;
         styledContent->GetID(contentID);
         if ((nsnull == aSelector->mID) || (aSelector->mID == contentID)) {
@@ -1322,7 +1322,7 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
     nsVoidArray classArray; // XXX need to recycle this guy (or make nsAutoVoidArray?)
 
     nsIStyledContent* styledContent;
-    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
       styledContent->GetID(idAtom);
       styledContent->GetClasses(classArray);
       NS_RELEASE(styledContent);
diff --git a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
index 46b08ebcf3d..fba833e463e 100644
--- a/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLCSSStyleSheet.cpp
@@ -191,7 +191,7 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   nsIStyledContent* styledContent;
 
   // just get the one and only style rule from the content's STYLE attribute
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     nsIStyleRule* rule = nsnull;
     if (NS_SUCCEEDED(styledContent->GetInlineStyleRule(rule))) {
       if (nsnull != rule) {
diff --git a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
index f96f24ccd51..aaaf8bb46e3 100644
--- a/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/html/style/src/nsHTMLStyleSheet.cpp
@@ -412,7 +412,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   PRInt32 matchCount = 0;
 
   nsIStyledContent* styledContent;
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     PRInt32 nameSpace;
     styledContent->GetNameSpaceID(nameSpace);
     if (kNameSpaceID_HTML == nameSpace) {
diff --git a/mozilla/layout/html/style/src/nsICSSStyleRule.h b/mozilla/layout/html/style/src/nsICSSStyleRule.h
index 51060172dc7..4d9a4adeb81 100644
--- a/mozilla/layout/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/layout/html/style/src/nsICSSStyleRule.h
@@ -102,7 +102,7 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
 
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
diff --git a/mozilla/layout/html/table/public/nsITableCellLayout.h b/mozilla/layout/html/table/public/nsITableCellLayout.h
index bbe43117ca0..1d4cbd06bd8 100644
--- a/mozilla/layout/html/table/public/nsITableCellLayout.h
+++ b/mozilla/layout/html/table/public/nsITableCellLayout.h
@@ -35,7 +35,7 @@ class nsITableCellLayout : public nsISupports
 {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ITABLECELLAYOUT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITABLECELLAYOUT_IID; return iid; }
 
   /** return the mapped cell's row index (starting at 0 for the first row) */
   virtual nsresult GetRowIndex(PRInt32 &aRowIndex)=0;
diff --git a/mozilla/layout/html/table/src/nsTableCellFrame.cpp b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
index 034a67d9816..ca80076b731 100644
--- a/mozilla/layout/html/table/src/nsTableCellFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableCellFrame.cpp
@@ -882,7 +882,7 @@ nsTableCellFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   if (NULL == aInstancePtr) {
     return NS_ERROR_NULL_POINTER;
   }
-  if (aIID.Equals(nsITableCellLayout::IID())) {
+  if (aIID.Equals(nsITableCellLayout::GetIID())) {
     *aInstancePtr = (void*)(nsISupports*)(nsITableCellLayout*)this;
     return NS_OK;
   }
diff --git a/mozilla/layout/style/nsCSSStyleSheet.cpp b/mozilla/layout/style/nsCSSStyleSheet.cpp
index c2bea3685b0..709d82e0512 100644
--- a/mozilla/layout/style/nsCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsCSSStyleSheet.cpp
@@ -1027,7 +1027,7 @@ static PRBool SelectorMatches(nsIPresContext* aPresContext,
         ((nsnull != aSelector->mID) || (nsnull != aSelector->mClassList))) {  // test for ID & class match
       result = PR_FALSE;
       nsIStyledContent* styledContent;
-      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+      if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
         nsIAtom* contentID;
         styledContent->GetID(contentID);
         if ((nsnull == aSelector->mID) || (aSelector->mID == contentID)) {
@@ -1322,7 +1322,7 @@ PRInt32 CSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
     nsVoidArray classArray; // XXX need to recycle this guy (or make nsAutoVoidArray?)
 
     nsIStyledContent* styledContent;
-    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+    if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
       styledContent->GetID(idAtom);
       styledContent->GetClasses(classArray);
       NS_RELEASE(styledContent);
diff --git a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
index 46b08ebcf3d..fba833e463e 100644
--- a/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLCSSStyleSheet.cpp
@@ -191,7 +191,7 @@ PRInt32 HTMLCSSStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   nsIStyledContent* styledContent;
 
   // just get the one and only style rule from the content's STYLE attribute
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     nsIStyleRule* rule = nsnull;
     if (NS_SUCCEEDED(styledContent->GetInlineStyleRule(rule))) {
       if (nsnull != rule) {
diff --git a/mozilla/layout/style/nsHTMLStyleSheet.cpp b/mozilla/layout/style/nsHTMLStyleSheet.cpp
index f96f24ccd51..aaaf8bb46e3 100644
--- a/mozilla/layout/style/nsHTMLStyleSheet.cpp
+++ b/mozilla/layout/style/nsHTMLStyleSheet.cpp
@@ -412,7 +412,7 @@ PRInt32 HTMLStyleSheetImpl::RulesMatching(nsIPresContext* aPresContext,
   PRInt32 matchCount = 0;
 
   nsIStyledContent* styledContent;
-  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::IID(), (void**)&styledContent))) {
+  if (NS_SUCCEEDED(aContent->QueryInterface(nsIStyledContent::GetIID(), (void**)&styledContent))) {
     PRInt32 nameSpace;
     styledContent->GetNameSpaceID(nameSpace);
     if (kNameSpaceID_HTML == nameSpace) {
diff --git a/mozilla/layout/style/nsICSSStyleRule.h b/mozilla/layout/style/nsICSSStyleRule.h
index 51060172dc7..4d9a4adeb81 100644
--- a/mozilla/layout/style/nsICSSStyleRule.h
+++ b/mozilla/layout/style/nsICSSStyleRule.h
@@ -102,7 +102,7 @@ public:
 
 class nsICSSStyleRule : public nsIStyleRule {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_RULE_IID; return iid; }
 
   virtual nsCSSSelector* FirstSelector(void) = 0;
   virtual void AddSelector(const nsCSSSelector& aSelector) = 0;
diff --git a/mozilla/layout/style/nsICSSStyleSheet.h b/mozilla/layout/style/nsICSSStyleSheet.h
index fef9f059b4e..d982be1408b 100644
--- a/mozilla/layout/style/nsICSSStyleSheet.h
+++ b/mozilla/layout/style/nsICSSStyleSheet.h
@@ -30,7 +30,7 @@ class nsIDOMNode;
 
 class nsICSSStyleSheet : public nsIStyleSheet {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICSS_STYLE_SHEET_IID; return iid; }
 
   virtual PRBool ContainsStyleSheet(nsIURL* aURL) const = 0;
 
diff --git a/mozilla/layout/style/nsIStyleRule.h b/mozilla/layout/style/nsIStyleRule.h
index cbb016daa43..af538ce969d 100644
--- a/mozilla/layout/style/nsIStyleRule.h
+++ b/mozilla/layout/style/nsIStyleRule.h
@@ -34,7 +34,7 @@ class nsIContent;
 
 class nsIStyleRule : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISTYLE_RULE_IID; return iid; }
 
   NS_IMETHOD Equals(const nsIStyleRule* aRule, PRBool& aResult) const = 0;
   NS_IMETHOD HashValue(PRUint32& aValue) const = 0;
diff --git a/mozilla/layout/tables/nsITableCellLayout.h b/mozilla/layout/tables/nsITableCellLayout.h
index bbe43117ca0..1d4cbd06bd8 100644
--- a/mozilla/layout/tables/nsITableCellLayout.h
+++ b/mozilla/layout/tables/nsITableCellLayout.h
@@ -35,7 +35,7 @@ class nsITableCellLayout : public nsISupports
 {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_ITABLECELLAYOUT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITABLECELLAYOUT_IID; return iid; }
 
   /** return the mapped cell's row index (starting at 0 for the first row) */
   virtual nsresult GetRowIndex(PRInt32 &aRowIndex)=0;
diff --git a/mozilla/layout/tables/nsTableCellFrame.cpp b/mozilla/layout/tables/nsTableCellFrame.cpp
index 034a67d9816..ca80076b731 100644
--- a/mozilla/layout/tables/nsTableCellFrame.cpp
+++ b/mozilla/layout/tables/nsTableCellFrame.cpp
@@ -882,7 +882,7 @@ nsTableCellFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
   if (NULL == aInstancePtr) {
     return NS_ERROR_NULL_POINTER;
   }
-  if (aIID.Equals(nsITableCellLayout::IID())) {
+  if (aIID.Equals(nsITableCellLayout::GetIID())) {
     *aInstancePtr = (void*)(nsISupports*)(nsITableCellLayout*)this;
     return NS_OK;
   }
diff --git a/mozilla/modules/plugin/bad/badapter.cpp b/mozilla/modules/plugin/bad/badapter.cpp
index 5b19a4825bb..12597e944d9 100644
--- a/mozilla/modules/plugin/bad/badapter.cpp
+++ b/mozilla/modules/plugin/bad/badapter.cpp
@@ -821,7 +821,7 @@ NPP_New(NPMIMEType pluginType,
 
     // Create a new plugin instance and start it.
     nsIPluginInstance* pluginInstance = NULL;
-    thePlugin->CreateInstance(thePluginManager, nsIPluginInstance::IID(), (void**)&pluginInstance);
+    thePlugin->CreateInstance(thePluginManager, nsIPluginInstance::GetIID(), (void**)&pluginInstance);
     if (pluginInstance == NULL) {
         return NPERR_OUT_OF_MEMORY_ERROR;
     }
@@ -1241,7 +1241,7 @@ CPluginManager::GetURL(nsISupports* pluginInst,
     }
 
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1291,7 +1291,7 @@ CPluginManager::PostURL(nsISupports* pluginInst,
     }
 
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1341,7 +1341,7 @@ CPluginManager::GetURL(nsISupports* pinst, const char* url, const char* target,
                        const char* referrer, PRBool forceJSEnabled)
 {
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1374,7 +1374,7 @@ CPluginManager::PostURL(nsISupports* pinst, const char* url, const char* target,
                         PRUint32 postHeadersLength, const char* postHeaders)
 {
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1524,17 +1524,17 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr)
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
   
-    if (iid.Equals(nsIServiceManager::IID())) {                                                          
+    if (iid.Equals(nsIServiceManager::GetIID())) {                                                          
         *ptr = (void*) (nsIServiceManager*)this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }
-    if (iid.Equals(nsIAllocator::IID())) {                                                          
+    if (iid.Equals(nsIAllocator::GetIID())) {                                                          
         *ptr = (void*) (nsIAllocator*)this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }
-    if (iid.Equals(nsIPluginManager::IID()) || iid.Equals(nsISupports::IID())) {
+    if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsISupports::GetIID())) {
         *ptr = (void*) ((nsIPluginManager*)this);                        
         AddRef();                                                            
         return NS_OK;                                                        
@@ -1783,12 +1783,12 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr)
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
   
-    if (iid.Equals(nsIPluginInstancePeer::IID())) {
+    if (iid.Equals(nsIPluginInstancePeer::GetIID())) {
         *ptr = (void*) this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }                                                                      
-    if (iid.Equals(nsIPluginTagInfo::IID()) || iid.Equals(nsISupports::IID())) {                                      
+    if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsISupports::GetIID())) {                                      
         *ptr = (void*) ((nsIPluginTagInfo*)this);                        
         AddRef();                                                            
         return NS_OK;                                                        
@@ -1903,7 +1903,7 @@ CPluginManagerStream::Close(void)
 NS_IMPL_ADDREF(CPluginManagerStream);
 NS_IMPL_RELEASE(CPluginManagerStream);
 
-NS_IMPL_QUERY_INTERFACE(CPluginManagerStream, nsIOutputStream::IID());
+NS_IMPL_QUERY_INTERFACE(CPluginManagerStream, nsIOutputStream::GetIID());
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -2091,7 +2091,7 @@ nsresult CPluginStreamPeer::QueryInterface(const nsIID& iid, void** ptr)
         AddRef(); 
         return NS_OK; 
 	} else if (iid.Equals(kIPluginStreamPeerIID) ||
-			   iid.Equals(nsISupports::IID())) {
+			   iid.Equals(nsISupports::GetIID())) {
         *ptr = (void*) ((nsIPluginStreamPeer*)this); 
         AddRef(); 
         return NS_OK; 
diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp
index 5b19a4825bb..12597e944d9 100644
--- a/mozilla/modules/plugin/samples/backward/badapter.cpp
+++ b/mozilla/modules/plugin/samples/backward/badapter.cpp
@@ -821,7 +821,7 @@ NPP_New(NPMIMEType pluginType,
 
     // Create a new plugin instance and start it.
     nsIPluginInstance* pluginInstance = NULL;
-    thePlugin->CreateInstance(thePluginManager, nsIPluginInstance::IID(), (void**)&pluginInstance);
+    thePlugin->CreateInstance(thePluginManager, nsIPluginInstance::GetIID(), (void**)&pluginInstance);
     if (pluginInstance == NULL) {
         return NPERR_OUT_OF_MEMORY_ERROR;
     }
@@ -1241,7 +1241,7 @@ CPluginManager::GetURL(nsISupports* pluginInst,
     }
 
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1291,7 +1291,7 @@ CPluginManager::PostURL(nsISupports* pluginInst,
     }
 
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pluginInst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1341,7 +1341,7 @@ CPluginManager::GetURL(nsISupports* pinst, const char* url, const char* target,
                        const char* referrer, PRBool forceJSEnabled)
 {
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1374,7 +1374,7 @@ CPluginManager::PostURL(nsISupports* pinst, const char* url, const char* target,
                         PRUint32 postHeadersLength, const char* postHeaders)
 {
     nsIPluginInstance* inst = NULL;
-    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::IID(), (void**)&inst);
+    nsresult rslt = pinst->QueryInterface(nsIPluginInstance::GetIID(), (void**)&inst);
     if (rslt != NS_OK) return rslt;
 	CPluginInstancePeer* instancePeer = NULL;
     rslt = inst->GetPeer((nsIPluginInstancePeer**)&instancePeer);
@@ -1524,17 +1524,17 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr)
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
   
-    if (iid.Equals(nsIServiceManager::IID())) {                                                          
+    if (iid.Equals(nsIServiceManager::GetIID())) {                                                          
         *ptr = (void*) (nsIServiceManager*)this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }
-    if (iid.Equals(nsIAllocator::IID())) {                                                          
+    if (iid.Equals(nsIAllocator::GetIID())) {                                                          
         *ptr = (void*) (nsIAllocator*)this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }
-    if (iid.Equals(nsIPluginManager::IID()) || iid.Equals(nsISupports::IID())) {
+    if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsISupports::GetIID())) {
         *ptr = (void*) ((nsIPluginManager*)this);                        
         AddRef();                                                            
         return NS_OK;                                                        
@@ -1783,12 +1783,12 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr)
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
   
-    if (iid.Equals(nsIPluginInstancePeer::IID())) {
+    if (iid.Equals(nsIPluginInstancePeer::GetIID())) {
         *ptr = (void*) this;                                        
         AddRef();                                                            
         return NS_OK;                                                        
     }                                                                      
-    if (iid.Equals(nsIPluginTagInfo::IID()) || iid.Equals(nsISupports::IID())) {                                      
+    if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsISupports::GetIID())) {                                      
         *ptr = (void*) ((nsIPluginTagInfo*)this);                        
         AddRef();                                                            
         return NS_OK;                                                        
@@ -1903,7 +1903,7 @@ CPluginManagerStream::Close(void)
 NS_IMPL_ADDREF(CPluginManagerStream);
 NS_IMPL_RELEASE(CPluginManagerStream);
 
-NS_IMPL_QUERY_INTERFACE(CPluginManagerStream, nsIOutputStream::IID());
+NS_IMPL_QUERY_INTERFACE(CPluginManagerStream, nsIOutputStream::GetIID());
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -2091,7 +2091,7 @@ nsresult CPluginStreamPeer::QueryInterface(const nsIID& iid, void** ptr)
         AddRef(); 
         return NS_OK; 
 	} else if (iid.Equals(kIPluginStreamPeerIID) ||
-			   iid.Equals(nsISupports::IID())) {
+			   iid.Equals(nsISupports::GetIID())) {
         *ptr = (void*) ((nsIPluginStreamPeer*)this); 
         AddRef(); 
         return NS_OK; 
diff --git a/mozilla/network/module/nsIConnectionInfo.h b/mozilla/network/module/nsIConnectionInfo.h
index f06febfdc21..4bf3e678d8f 100644
--- a/mozilla/network/module/nsIConnectionInfo.h
+++ b/mozilla/network/module/nsIConnectionInfo.h
@@ -33,7 +33,7 @@ class nsIStreamListener;
 class nsIConnectionInfo : public nsISupports {
 public:
 
-	static const nsIID& IID() { static nsIID iid = NS_ICONNECTIONINFO_IID; return iid; }
+	static const nsIID& GetIID() { static nsIID iid = NS_ICONNECTIONINFO_IID; return iid; }
 
   /**
    * Get the URL associated with this connection.
diff --git a/mozilla/network/module/nsINetService.h b/mozilla/network/module/nsINetService.h
index 86e8fe0887c..ab266d8b2e5 100644
--- a/mozilla/network/module/nsINetService.h
+++ b/mozilla/network/module/nsINetService.h
@@ -54,7 +54,7 @@ class nsIProtocol;
  */
 struct nsINetService : public nsISupports 
 {
-	static const nsIID& IID() { static nsIID iid = NS_INETSERVICE_IID; return iid; }
+	static const nsIID& GetIID() { static nsIID iid = NS_INETSERVICE_IID; return iid; }
     /**
      * Initiate an asynchronous URL load.<BR><BR>
      *
diff --git a/mozilla/network/module/nsINetlibURL.h b/mozilla/network/module/nsINetlibURL.h
index 26601ecf538..b751eaeb6e3 100644
--- a/mozilla/network/module/nsINetlibURL.h
+++ b/mozilla/network/module/nsINetlibURL.h
@@ -40,7 +40,7 @@ struct URL_Struct_;
  */
 class nsINetlibURL : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_INETLIBURL_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_INETLIBURL_IID; return iid; }
 
   NS_IMETHOD GetURLInfo(URL_Struct_ **aResult) const = 0;
   NS_IMETHOD SetURLInfo(URL_Struct_ *URL_s) = 0;
diff --git a/mozilla/network/public/nsIHttpURL.h b/mozilla/network/public/nsIHttpURL.h
index aa9dc847373..a62ef2b0439 100644
--- a/mozilla/network/public/nsIHttpURL.h
+++ b/mozilla/network/public/nsIHttpURL.h
@@ -31,7 +31,7 @@
 
 struct nsIHttpURL : public nsISupports
 {
-	static const nsIID& IID() { static nsIID iid = NS_IHTTPURL_IID; return iid; }
+	static const nsIID& GetIID() { static nsIID iid = NS_IHTTPURL_IID; return iid; }
 
     /**
       * Parse the mime header into the url struct.
diff --git a/mozilla/network/public/nsILoadAttribs.h b/mozilla/network/public/nsILoadAttribs.h
index 09f625ab310..e3b906f9b2c 100644
--- a/mozilla/network/public/nsILoadAttribs.h
+++ b/mozilla/network/public/nsILoadAttribs.h
@@ -57,7 +57,7 @@ typedef enum {
 // Defining attributes of a url's load behavior.
 class nsILoadAttribs : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ILOAD_ATTRIBS_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ILOAD_ATTRIBS_IID; return iid; }
     // Copy the state of another nsILoadAttribs instance.
   NS_IMETHOD Clone(nsILoadAttribs* aLoadAttribs) = 0;
 
diff --git a/mozilla/network/public/nsIStreamListener.h b/mozilla/network/public/nsIStreamListener.h
index faeb48172c0..e3d35af0372 100644
--- a/mozilla/network/public/nsIStreamListener.h
+++ b/mozilla/network/public/nsIStreamListener.h
@@ -50,7 +50,7 @@ struct nsStreamBindingInfo {
  */
 class nsIStreamListener : public nsIStreamObserver {
 public:
-	 static const nsIID& IID() { static nsIID iid = NS_ISTREAMLISTENER_IID; return iid; }
+	 static const nsIID& GetIID() { static nsIID iid = NS_ISTREAMLISTENER_IID; return iid; }
     /**
      * Return information regarding the current URL load.<BR>
      * The info structure that is passed in is filled out and returned
diff --git a/mozilla/network/public/nsITransport.h b/mozilla/network/public/nsITransport.h
index c31985d5084..a5a12c6f9b2 100644
--- a/mozilla/network/public/nsITransport.h
+++ b/mozilla/network/public/nsITransport.h
@@ -32,7 +32,7 @@
 
 class nsITransport : public nsIStreamListener {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ITRANSPORT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITRANSPORT_IID; return iid; }
 
   /** Accessors */
 
diff --git a/mozilla/network/public/nsIURL.h b/mozilla/network/public/nsIURL.h
index 2e334b18da2..f1b751cb93f 100644
--- a/mozilla/network/public/nsIURL.h
+++ b/mozilla/network/public/nsIURL.h
@@ -34,7 +34,7 @@ class nsIURLGroup;
 
 class nsIURL : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IURL_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IURL_IID; return iid; }
 
   /** Equality operator */
   NS_IMETHOD_(PRBool) Equals(const nsIURL *aURL) const = 0;
diff --git a/mozilla/rdf/base/public/nsIRDFCompositeDataSource.h b/mozilla/rdf/base/public/nsIRDFCompositeDataSource.h
index 63d689248c3..c4eee1c66a2 100644
--- a/mozilla/rdf/base/public/nsIRDFCompositeDataSource.h
+++ b/mozilla/rdf/base/public/nsIRDFCompositeDataSource.h
@@ -41,7 +41,7 @@ class nsIRDFDataSource;
  */
 class nsIRDFCompositeDataSource : public nsIRDFDataSource {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFCOMPOSITEDATASOURCE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFCOMPOSITEDATASOURCE_IID; return iid; }
 
     /**
      * Add a datasource the the database.
diff --git a/mozilla/rdf/base/public/nsIRDFContentSink.h b/mozilla/rdf/base/public/nsIRDFContentSink.h
index 7399f55d79c..73fa182e014 100644
--- a/mozilla/rdf/base/public/nsIRDFContentSink.h
+++ b/mozilla/rdf/base/public/nsIRDFContentSink.h
@@ -43,7 +43,7 @@ class nsIURL;
 
 class nsIRDFContentSink : public nsIXMLContentSink {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFCONTENTSINK_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFCONTENTSINK_IID; return iid; }
 
     /**
      * Initialize the content sink.
diff --git a/mozilla/rdf/base/public/nsIRDFCursor.h b/mozilla/rdf/base/public/nsIRDFCursor.h
index 4b875211d1d..bcb6a0acb66 100644
--- a/mozilla/rdf/base/public/nsIRDFCursor.h
+++ b/mozilla/rdf/base/public/nsIRDFCursor.h
@@ -43,7 +43,7 @@ class nsIRDFResource;
  */
 class nsIRDFCursor : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFCURSOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFCURSOR_IID; return iid; }
 
     /**
      * Advance the cursor to the next element.
@@ -75,7 +75,7 @@ public:
  */
 class nsIRDFAssertionCursor : public nsIRDFCursor {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFASSERTIONCURSOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFASSERTIONCURSOR_IID; return iid; }
 
     /**
      * Retrieve the assertion's subject resource.
@@ -113,7 +113,7 @@ public:
  */
 class nsIRDFArcsOutCursor : public nsIRDFCursor {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFARCSOUTCURSOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFARCSOUTCURSOR_IID; return iid; }
     
 
     /**
@@ -141,7 +141,7 @@ public:
  */
 class nsIRDFArcsInCursor : public nsIRDFCursor {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFARCSINCURSOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFARCSINCURSOR_IID; return iid; }
 
     /**
      * Retrieve the "object" node in which the arc terminates.
@@ -166,7 +166,7 @@ public:
  */
 class nsIRDFResourceCursor : public nsIRDFCursor {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFRESOURCECURSOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFRESOURCECURSOR_IID; return iid; }
     NS_IMETHOD GetResource(nsIRDFResource** aResource) = 0;
 };
 
diff --git a/mozilla/rdf/base/public/nsIRDFDataSource.h b/mozilla/rdf/base/public/nsIRDFDataSource.h
index e9b45bf6091..246a478c5c7 100644
--- a/mozilla/rdf/base/public/nsIRDFDataSource.h
+++ b/mozilla/rdf/base/public/nsIRDFDataSource.h
@@ -47,7 +47,7 @@ class nsIRDFResourceCursor;
 
 class nsIRDFDataSource : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFDATASOURCE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFDATASOURCE_IID; return iid; }
 
     // XXX I didn't make some of these methods "const" because it's
     // probably pretty likely that many data sources will just make
diff --git a/mozilla/rdf/base/public/nsIRDFNode.h b/mozilla/rdf/base/public/nsIRDFNode.h
index 4c4b440e470..f89560a1a30 100644
--- a/mozilla/rdf/base/public/nsIRDFNode.h
+++ b/mozilla/rdf/base/public/nsIRDFNode.h
@@ -55,7 +55,7 @@
 
 class NS_RDF nsIRDFNode : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFNODE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFNODE_IID; return iid; }
 
     /**
      * Called by nsIRDFService after constructing a resource object to
@@ -80,7 +80,7 @@ public:
 
 class NS_RDF nsIRDFResource : public nsIRDFNode {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFRESOURCE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFRESOURCE_IID; return iid; }
 
     /**
      * Get the 8-bit string value of the node.
@@ -105,7 +105,7 @@ public:
 
 class NS_RDF nsIRDFLiteral : public nsIRDFNode {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFLITERAL_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFLITERAL_IID; return iid; }
 
     /**
      * Get the Unicode string value of the node.
diff --git a/mozilla/rdf/base/public/nsIRDFObserver.h b/mozilla/rdf/base/public/nsIRDFObserver.h
index 7c50e093428..c83c073eb18 100644
--- a/mozilla/rdf/base/public/nsIRDFObserver.h
+++ b/mozilla/rdf/base/public/nsIRDFObserver.h
@@ -43,7 +43,7 @@ class nsIRDFNode;
 class nsIRDFObserver : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFOBSERVER_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFOBSERVER_IID; return iid; }
 
     /**
      * Called whenever a new assertion is made in the data source.
diff --git a/mozilla/rdf/base/public/nsIRDFResourceFactory.h b/mozilla/rdf/base/public/nsIRDFResourceFactory.h
index 2cbc4d53cf8..65c7766f3d2 100644
--- a/mozilla/rdf/base/public/nsIRDFResourceFactory.h
+++ b/mozilla/rdf/base/public/nsIRDFResourceFactory.h
@@ -48,7 +48,7 @@ class nsIRDFResource;
 class nsIRDFResourceFactory : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFRESOURCEFACTORY_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFRESOURCEFACTORY_IID; return iid; }
 
     /**
      * This method is called by the RDF service to create a new
diff --git a/mozilla/rdf/base/public/nsIRDFService.h b/mozilla/rdf/base/public/nsIRDFService.h
index 0b8910d609c..294e1c68930 100644
--- a/mozilla/rdf/base/public/nsIRDFService.h
+++ b/mozilla/rdf/base/public/nsIRDFService.h
@@ -49,7 +49,7 @@ class nsIRDFResource;
 
 class nsIRDFService : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFSERVICE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFSERVICE_IID; return iid; }
 
     // Resource management routines
 
diff --git a/mozilla/rdf/base/public/nsIRDFXMLDataSource.h b/mozilla/rdf/base/public/nsIRDFXMLDataSource.h
index 56c3772422b..dbdde93b551 100644
--- a/mozilla/rdf/base/public/nsIRDFXMLDataSource.h
+++ b/mozilla/rdf/base/public/nsIRDFXMLDataSource.h
@@ -45,7 +45,7 @@ class nsIRDFXMLDataSource;
 class nsIRDFXMLDataSourceObserver : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFXMLDOCUMENTOBSERVER_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFXMLDOCUMENTOBSERVER_IID; return iid; }
 
     /**
      * Called when the RDF/XML document begins to load.
@@ -94,7 +94,7 @@ public:
 class nsIRDFXMLDataSource : public nsIRDFDataSource
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFXMLDATASOURCE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFXMLDATASOURCE_IID; return iid; }
 
     /**
      * Sets the RDF/XML stream to load either synchronously or
diff --git a/mozilla/rdf/base/public/nsIRDFXMLSource.h b/mozilla/rdf/base/public/nsIRDFXMLSource.h
index 2935ed7b435..70fc0a2eb8b 100644
--- a/mozilla/rdf/base/public/nsIRDFXMLSource.h
+++ b/mozilla/rdf/base/public/nsIRDFXMLSource.h
@@ -36,7 +36,7 @@ class nsIOutputStream;
 class nsIRDFXMLSource : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFXMLSOURCE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFXMLSOURCE_IID; return iid; }
 
     NS_IMETHOD Serialize(nsIOutputStream* aStream) = 0;
 };
diff --git a/mozilla/rdf/base/src/nsRDFService.cpp b/mozilla/rdf/base/src/nsRDFService.cpp
index 5e48efebda7..beb6aaff3c8 100644
--- a/mozilla/rdf/base/src/nsRDFService.cpp
+++ b/mozilla/rdf/base/src/nsRDFService.cpp
@@ -328,13 +328,13 @@ ServiceImpl::GetResource(const char* aURI, nsIRDFResource** aResource)
         rv = NSGetFactory(servMgr, kRDFDefaultResourceCID,
                           "", NS_RDF_RESOURCE_FACTORY_PROGID, &fact);
         if (rv == NS_OK) {
-            rv = fact->CreateInstance(nsnull, nsIRDFResource::IID(),
+            rv = fact->CreateInstance(nsnull, nsIRDFResource::GetIID(),
                                       (void**)&result);
             NS_RELEASE(fact);
         }
 #else
         rv = nsRepository::CreateInstance(NS_RDF_RESOURCE_FACTORY_PROGID,
-                                          nsnull, nsIRDFResource::IID(),
+                                          nsnull, nsIRDFResource::GetIID(),
                                           (void**)&result);
 #endif
         if (NS_FAILED(rv)) {
@@ -367,13 +367,13 @@ ServiceImpl::GetResource(const char* aURI, nsIRDFResource** aResource)
         rv = NSGetFactory(servMgr, kRDFDefaultResourceCID,
                           "", progID, &fact);
         if (rv == NS_OK) {
-            rv = fact->CreateInstance(nsnull, nsIRDFResource::IID(),
+            rv = fact->CreateInstance(nsnull, nsIRDFResource::GetIID(),
                                       (void**)&result);
             NS_RELEASE(fact);
         }
 #else
         rv = nsRepository::CreateInstance(progID, nsnull,
-                                          nsIRDFResource::IID(),
+                                          nsIRDFResource::GetIID(),
                                           (void**)&result);
 #endif
         if (progID != buf)
@@ -388,13 +388,13 @@ ServiceImpl::GetResource(const char* aURI, nsIRDFResource** aResource)
             rv = NSGetFactory(servMgr, kRDFDefaultResourceCID,
                               "", NS_RDF_RESOURCE_FACTORY_PROGID, &fact);
             if (rv == NS_OK) {
-                rv = fact->CreateInstance(nsnull, nsIRDFResource::IID(),
+                rv = fact->CreateInstance(nsnull, nsIRDFResource::GetIID(),
                                           (void**)&result);
                 NS_RELEASE(fact);
             }
 #else
             rv = nsRepository::CreateInstance(NS_RDF_RESOURCE_FACTORY_PROGID,
-                                              nsnull, nsIRDFResource::IID(),
+                                              nsnull, nsIRDFResource::GetIID(),
                                               (void**)&result);
 #endif
             if (NS_FAILED(rv)) {
@@ -623,13 +623,13 @@ ServiceImpl::GetDataSource(const char* uri, nsIRDFDataSource** aDataSource)
     rv = NSGetFactory(servMgr, cid,
                       "", progID, &fact);
     if (rv == NS_OK) {
-        rv = fact->CreateInstance(nsnull, nsIRDFDataSource::IID(),
+        rv = fact->CreateInstance(nsnull, nsIRDFDataSource::GetIID(),
                                   (void**)aDataSource);
         NS_RELEASE(fact);
     }
 #else
     rv = nsRepository::CreateInstance(progID, nsnull,
-                                      nsIRDFDataSource::IID(),
+                                      nsIRDFDataSource::GetIID(),
                                       (void**)aDataSource);
 #endif
 
diff --git a/mozilla/rdf/content/public/nsIDOMElementObserver.h b/mozilla/rdf/content/public/nsIDOMElementObserver.h
index 9888e6cd188..bcc7761abee 100644
--- a/mozilla/rdf/content/public/nsIDOMElementObserver.h
+++ b/mozilla/rdf/content/public/nsIDOMElementObserver.h
@@ -33,7 +33,7 @@ class nsIDOMAttr;
 
 class nsIDOMElementObserver : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMELEMENTOBSERVER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMELEMENTOBSERVER_IID; return iid; }
 
   NS_IMETHOD    OnSetAttribute(nsIDOMElement* aElement, const nsString& aName, const nsString& aValue)=0;
 
diff --git a/mozilla/rdf/content/public/nsIDOMNodeObserver.h b/mozilla/rdf/content/public/nsIDOMNodeObserver.h
index be9fa3e310e..2887f9998f9 100644
--- a/mozilla/rdf/content/public/nsIDOMNodeObserver.h
+++ b/mozilla/rdf/content/public/nsIDOMNodeObserver.h
@@ -32,7 +32,7 @@ class nsIDOMNode;
 
 class nsIDOMNodeObserver : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMNODEOBSERVER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMNODEOBSERVER_IID; return iid; }
 
   NS_IMETHOD    OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue)=0;
 
diff --git a/mozilla/rdf/content/public/nsIDOMXULDocument.h b/mozilla/rdf/content/public/nsIDOMXULDocument.h
index 0059ad50126..500a42ed8ea 100644
--- a/mozilla/rdf/content/public/nsIDOMXULDocument.h
+++ b/mozilla/rdf/content/public/nsIDOMXULDocument.h
@@ -34,7 +34,7 @@ class nsIDOMNodeList;
 
 class nsIDOMXULDocument : public nsIDOMDocument {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULDOCUMENT_IID; return iid; }
 
   NS_IMETHOD    GetElementByID(const nsString& aId, nsIDOMNode** aReturn)=0;
 
diff --git a/mozilla/rdf/content/public/nsIDOMXULElement.h b/mozilla/rdf/content/public/nsIDOMXULElement.h
index 8ff9bac183c..66914ee784e 100644
--- a/mozilla/rdf/content/public/nsIDOMXULElement.h
+++ b/mozilla/rdf/content/public/nsIDOMXULElement.h
@@ -34,7 +34,7 @@ class nsIDOMNodeList;
 
 class nsIDOMXULElement : public nsIDOMElement {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMXULELEMENT_IID; return iid; }
 
   NS_IMETHOD    AddBroadcastListener(const nsString& aAttr, nsIDOMNode* aNode)=0;
 
diff --git a/mozilla/rdf/content/public/nsIRDFContentModelBuilder.h b/mozilla/rdf/content/public/nsIRDFContentModelBuilder.h
index 04632c4fe09..8b44ad32d6b 100644
--- a/mozilla/rdf/content/public/nsIRDFContentModelBuilder.h
+++ b/mozilla/rdf/content/public/nsIRDFContentModelBuilder.h
@@ -43,7 +43,7 @@ class nsIRDFResource;
 class nsIRDFContentModelBuilder : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IRDFCONTENTMODELBUILDER_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IRDFCONTENTMODELBUILDER_IID; return iid; }
 
     /**
      * Point the content model builder to the document. The content model
diff --git a/mozilla/rdf/content/public/nsIRDFDocument.h b/mozilla/rdf/content/public/nsIRDFDocument.h
index 17a483b5aec..00e7ffa9909 100644
--- a/mozilla/rdf/content/public/nsIRDFDocument.h
+++ b/mozilla/rdf/content/public/nsIRDFDocument.h
@@ -49,7 +49,7 @@ class nsIRDFResource;
 class nsIRDFDocument : public nsIXMLDocument
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IRDFDOCUMENT_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IRDFDOCUMENT_IID; return iid; }
 
   /**
    * Set the document's "root" resource.
diff --git a/mozilla/rdf/content/src/nsRDFDOMNodeList.cpp b/mozilla/rdf/content/src/nsRDFDOMNodeList.cpp
index 63d6902d926..4c330ba1173 100644
--- a/mozilla/rdf/content/src/nsRDFDOMNodeList.cpp
+++ b/mozilla/rdf/content/src/nsRDFDOMNodeList.cpp
@@ -96,7 +96,7 @@ RDFHTMLCollectionImpl::QueryInterface(REFNSIID aIID, void** aResult)
     if (! aResult)
         return NS_ERROR_NULL_POINTER;
 
-    if (aIID.Equals(nsIDOMHTMLCollection::IID())) {
+    if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMHTMLCollection*, this);
         NS_ADDREF(this);
         return NS_OK;
@@ -186,7 +186,7 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
     if (! aResult)
         return NS_ERROR_NULL_POINTER;
 
-    if (aIID.Equals(nsIDOMNodeList::IID()) ||
+    if (aIID.Equals(nsIDOMNodeList::GetIID()) ||
         aIID.Equals(kISupportsIID)) {
         *aResult = NS_STATIC_CAST(nsIDOMNodeList*, this);
         NS_ADDREF(this);
@@ -197,7 +197,7 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
         NS_ADDREF(this);
         return NS_OK;
     }
-    else if (aIID.Equals(nsIDOMHTMLCollection::IID())) {
+    else if (aIID.Equals(nsIDOMHTMLCollection::GetIID())) {
         // Aggregate this interface
         if (! mInner) {
             if (! (mInner = new RDFHTMLCollectionImpl(this)))
diff --git a/mozilla/rdf/content/src/nsRDFElement.cpp b/mozilla/rdf/content/src/nsRDFElement.cpp
index 43f1d7075d1..9e4f4bcfa4d 100644
--- a/mozilla/rdf/content/src/nsRDFElement.cpp
+++ b/mozilla/rdf/content/src/nsRDFElement.cpp
@@ -401,7 +401,7 @@ RDFElementImpl::QueryInterface(REFNSIID iid, void** result)
         iid.Equals(kISupportsIID)) {
         *result = NS_STATIC_CAST(nsIContent*, this);
     }
-    else if (iid.Equals(nsIDOMXULElement::IID()) ||
+    else if (iid.Equals(nsIDOMXULElement::GetIID()) ||
              iid.Equals(kIDOMElementIID) ||
              iid.Equals(kIDOMNodeIID)) {
         *result = NS_STATIC_CAST(nsIDOMElement*, this);
@@ -626,7 +626,7 @@ NS_IMETHODIMP
 RDFElementImpl::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 {
     if (mDocument) {
-        return mDocument->QueryInterface(nsIDOMDocument::IID(), (void**) aOwnerDocument);
+        return mDocument->QueryInterface(nsIDOMDocument::GetIID(), (void**) aOwnerDocument);
     }
     else {
         *aOwnerDocument = nsnull;
@@ -643,7 +643,7 @@ RDFElementImpl::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnInsertBefore(this, aNewChild, aRefChild);
         NS_RELEASE(obs);
     }
@@ -661,7 +661,7 @@ RDFElementImpl::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnReplaceChild(this, aNewChild, aOldChild);
         NS_RELEASE(obs);
     }
@@ -679,7 +679,7 @@ RDFElementImpl::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveChild(this, aOldChild);
         NS_RELEASE(obs);
     }
@@ -697,7 +697,7 @@ RDFElementImpl::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnAppendChild(this, aNewChild);
         NS_RELEASE(obs);
     }
@@ -762,7 +762,7 @@ NS_IMETHODIMP
 RDFElementImpl::SetAttribute(const nsString& aName, const nsString& aValue)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttribute(this, aName, aValue);
         NS_RELEASE(obs);
     }
@@ -774,7 +774,7 @@ NS_IMETHODIMP
 RDFElementImpl::RemoveAttribute(const nsString& aName)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttribute(this, aName);
         NS_RELEASE(obs);
     }
@@ -798,7 +798,7 @@ RDFElementImpl::SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttributeNode(this, aNewAttr);
         NS_RELEASE(obs);
     }
@@ -816,7 +816,7 @@ RDFElementImpl::RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttributeNode(this, aOldAttr);
         NS_RELEASE(obs);
     }
@@ -837,7 +837,7 @@ RDFElementImpl::GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aRe
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByTagName(domElement, aName, elements);
         NS_RELEASE(domElement);
     }
@@ -859,7 +859,7 @@ RDFElementImpl::GetElementsByAttribute(const nsString& aAttribute,
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByAttribute(domElement, aAttribute, aValue, elements);
         NS_RELEASE(domElement);
     }
diff --git a/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp b/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp
index 4e13633f296..7b012fb811b 100644
--- a/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFTreeBuilder.cpp
@@ -445,10 +445,10 @@ RDFTreeBuilderImpl::QueryInterface(REFNSIID iid, void** aResult)
     else if (iid.Equals(kIRDFObserverIID)) {
         *aResult = NS_STATIC_CAST(nsIRDFObserver*, this);
     }
-    else if (iid.Equals(nsIDOMNodeObserver::IID())) {
+    else if (iid.Equals(nsIDOMNodeObserver::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMNodeObserver*, this);
     }
-    else if (iid.Equals(nsIDOMElementObserver::IID())) {
+    else if (iid.Equals(nsIDOMElementObserver::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMElementObserver*, this);
     }
     else {
diff --git a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
index d89e74c4829..e0c380e62aa 100644
--- a/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
+++ b/mozilla/rdf/content/src/nsRDFXULBuilder.cpp
@@ -353,10 +353,10 @@ RDFXULBuilderImpl::QueryInterface(REFNSIID iid, void** aResult)
     else if (iid.Equals(kIRDFObserverIID)) {
         *aResult = NS_STATIC_CAST(nsIRDFObserver*, this);
     }
-    else if (iid.Equals(nsIDOMNodeObserver::IID())) {
+    else if (iid.Equals(nsIDOMNodeObserver::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMNodeObserver*, this);
     }
-    else if (iid.Equals(nsIDOMElementObserver::IID())) {
+    else if (iid.Equals(nsIDOMElementObserver::GetIID())) {
         *aResult = NS_STATIC_CAST(nsIDOMElementObserver*, this);
     }
     else {
diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp
index 534c1516101..74ea58c7dee 100644
--- a/mozilla/rdf/content/src/nsXULDocument.cpp
+++ b/mozilla/rdf/content/src/nsXULDocument.cpp
@@ -728,9 +728,9 @@ XULDocumentImpl::QueryInterface(REFNSIID iid, void** result)
              iid.Equals(kIXMLDocumentIID)) {
         *result = NS_STATIC_CAST(nsIRDFDocument*, this);
     }
-    else if (iid.Equals(nsIDOMXULDocument::IID()) ||
-             iid.Equals(nsIDOMDocument::IID()) ||
-             iid.Equals(nsIDOMNode::IID())) {
+    else if (iid.Equals(nsIDOMXULDocument::GetIID()) ||
+             iid.Equals(nsIDOMDocument::GetIID()) ||
+             iid.Equals(nsIDOMNode::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMXULDocument*, this);
     }
     else if (iid.Equals(kIJSScriptObjectIID)) {
@@ -742,10 +742,10 @@ XULDocumentImpl::QueryInterface(REFNSIID iid, void** result)
     else if (iid.Equals(kIHTMLContentContainerIID)) {
         *result = NS_STATIC_CAST(nsIHTMLContentContainer*, this);
     }
-    else if (iid.Equals(nsIDOMNodeObserver::IID())) {
+    else if (iid.Equals(nsIDOMNodeObserver::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMNodeObserver*, this);
     }
-    else if (iid.Equals(nsIDOMElementObserver::IID())) {
+    else if (iid.Equals(nsIDOMElementObserver::GetIID())) {
         *result = NS_STATIC_CAST(nsIDOMElementObserver*, this);
     }
     else {
@@ -2054,7 +2054,7 @@ XULDocumentImpl::GetDocumentElement(nsIDOMElement** aDocumentElement)
   nsresult res = NS_ERROR_FAILURE;
 
   if (nsnull != mRootContent) {
-    res = mRootContent->QueryInterface(nsIDOMElement::IID(), (void**)aDocumentElement);
+    res = mRootContent->QueryInterface(nsIDOMElement::GetIID(), (void**)aDocumentElement);
     NS_ASSERTION(NS_OK == res, "Must be a DOM Element");
   }
   
@@ -2142,7 +2142,7 @@ XULDocumentImpl::GetElementsByTagName(const nsString& aTagName, nsIDOMNodeList**
 
     if (root != nsnull) {
         nsIDOMNode* domRoot;
-        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::IID(), (void**) &domRoot))) {
+        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::GetIID(), (void**) &domRoot))) {
             rv = GetElementsByTagName(domRoot, aTagName, elements);
             NS_RELEASE(domRoot);
         }
@@ -2169,7 +2169,7 @@ XULDocumentImpl::GetElementsByAttribute(const nsString& aAttribute, const nsStri
 
     if (root != nsnull) {
         nsIDOMNode* domRoot;
-        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::IID(), (void**) &domRoot))) {
+        if (NS_SUCCEEDED(rv = root->QueryInterface(nsIDOMNode::GetIID(), (void**) &domRoot))) {
             rv = GetElementsByAttribute(domRoot, aAttribute, aValue, elements);
             NS_RELEASE(domRoot);
         }
@@ -2223,7 +2223,7 @@ XULDocumentImpl::GetElementByID(const nsString& aId, nsIDOMNode** aReturn)
 
     if (elements->Count() > 0) {
         nsISupports* element = elements->ElementAt(0);
-        rv = element->QueryInterface(nsIDOMNode::IID(), (void**) aReturn);
+        rv = element->QueryInterface(nsIDOMNode::GetIID(), (void**) aReturn);
         NS_ASSERTION(NS_SUCCEEDED(rv), "not a DOM node");
         NS_RELEASE(element);
         return rv;
@@ -2585,7 +2585,7 @@ XULDocumentImpl::OnSetNodeValue(nsIDOMNode* aNode, const nsString& aValue)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnSetNodeValue(aNode, aValue);
             NS_RELEASE(obs);
         }
@@ -2605,7 +2605,7 @@ XULDocumentImpl::OnInsertBefore(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsID
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnInsertBefore(aParent, aNewChild, aRefChild);
             NS_RELEASE(obs);
         }
@@ -2625,7 +2625,7 @@ XULDocumentImpl::OnReplaceChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild, nsID
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnReplaceChild(aParent, aNewChild, aOldChild);
             NS_RELEASE(obs);
         }
@@ -2645,7 +2645,7 @@ XULDocumentImpl::OnRemoveChild(nsIDOMNode* aParent, nsIDOMNode* aOldChild)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveChild(aParent, aOldChild);
             NS_RELEASE(obs);
         }
@@ -2665,7 +2665,7 @@ XULDocumentImpl::OnAppendChild(nsIDOMNode* aParent, nsIDOMNode* aNewChild)
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMNodeObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
             obs->OnAppendChild(aParent, aNewChild);
             NS_RELEASE(obs);
         }
@@ -2688,7 +2688,7 @@ XULDocumentImpl::OnSetAttribute(nsIDOMElement* aElement, const nsString& aName,
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnSetAttribute(aElement, aName, aValue);
             NS_RELEASE(obs);
         }
@@ -2706,7 +2706,7 @@ XULDocumentImpl::OnRemoveAttribute(nsIDOMElement* aElement, const nsString& aNam
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveAttribute(aElement, aName);
             NS_RELEASE(obs);
         }
@@ -2724,7 +2724,7 @@ XULDocumentImpl::OnSetAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aNewAtt
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnSetAttributeNode(aElement, aNewAttr);
             NS_RELEASE(obs);
         }
@@ -2742,7 +2742,7 @@ XULDocumentImpl::OnRemoveAttributeNode(nsIDOMElement* aElement, nsIDOMAttr* aOld
             = (nsIRDFContentModelBuilder*) mBuilders->ElementAt(i);
 
         nsIDOMElementObserver* obs;
-        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+        if (NS_SUCCEEDED(builder->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
             obs->OnRemoveAttributeNode(aElement, aOldAttr);
             NS_RELEASE(obs);
         }
diff --git a/mozilla/rdf/content/src/nsXULElement.cpp b/mozilla/rdf/content/src/nsXULElement.cpp
index 43f1d7075d1..9e4f4bcfa4d 100644
--- a/mozilla/rdf/content/src/nsXULElement.cpp
+++ b/mozilla/rdf/content/src/nsXULElement.cpp
@@ -401,7 +401,7 @@ RDFElementImpl::QueryInterface(REFNSIID iid, void** result)
         iid.Equals(kISupportsIID)) {
         *result = NS_STATIC_CAST(nsIContent*, this);
     }
-    else if (iid.Equals(nsIDOMXULElement::IID()) ||
+    else if (iid.Equals(nsIDOMXULElement::GetIID()) ||
              iid.Equals(kIDOMElementIID) ||
              iid.Equals(kIDOMNodeIID)) {
         *result = NS_STATIC_CAST(nsIDOMElement*, this);
@@ -626,7 +626,7 @@ NS_IMETHODIMP
 RDFElementImpl::GetOwnerDocument(nsIDOMDocument** aOwnerDocument)
 {
     if (mDocument) {
-        return mDocument->QueryInterface(nsIDOMDocument::IID(), (void**) aOwnerDocument);
+        return mDocument->QueryInterface(nsIDOMDocument::GetIID(), (void**) aOwnerDocument);
     }
     else {
         *aOwnerDocument = nsnull;
@@ -643,7 +643,7 @@ RDFElementImpl::InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnInsertBefore(this, aNewChild, aRefChild);
         NS_RELEASE(obs);
     }
@@ -661,7 +661,7 @@ RDFElementImpl::ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDO
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnReplaceChild(this, aNewChild, aOldChild);
         NS_RELEASE(obs);
     }
@@ -679,7 +679,7 @@ RDFElementImpl::RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveChild(this, aOldChild);
         NS_RELEASE(obs);
     }
@@ -697,7 +697,7 @@ RDFElementImpl::AppendChild(nsIDOMNode* aNewChild, nsIDOMNode** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMNodeObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMNodeObserver::GetIID(), (void**) &obs))) {
         obs->OnAppendChild(this, aNewChild);
         NS_RELEASE(obs);
     }
@@ -762,7 +762,7 @@ NS_IMETHODIMP
 RDFElementImpl::SetAttribute(const nsString& aName, const nsString& aValue)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttribute(this, aName, aValue);
         NS_RELEASE(obs);
     }
@@ -774,7 +774,7 @@ NS_IMETHODIMP
 RDFElementImpl::RemoveAttribute(const nsString& aName)
 {
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttribute(this, aName);
         NS_RELEASE(obs);
     }
@@ -798,7 +798,7 @@ RDFElementImpl::SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnSetAttributeNode(this, aNewAttr);
         NS_RELEASE(obs);
     }
@@ -816,7 +816,7 @@ RDFElementImpl::RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn)
         return NS_ERROR_NULL_POINTER;
 
     nsIDOMElementObserver* obs;
-    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::IID(), (void**) &obs))) {
+    if (NS_SUCCEEDED(mDocument->QueryInterface(nsIDOMElementObserver::GetIID(), (void**) &obs))) {
         obs->OnRemoveAttributeNode(this, aOldAttr);
         NS_RELEASE(obs);
     }
@@ -837,7 +837,7 @@ RDFElementImpl::GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aRe
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByTagName(domElement, aName, elements);
         NS_RELEASE(domElement);
     }
@@ -859,7 +859,7 @@ RDFElementImpl::GetElementsByAttribute(const nsString& aAttribute,
     }
 
     nsIDOMNode* domElement;
-    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::IID(), (void**) &domElement))) {
+    if (NS_SUCCEEDED(rv = QueryInterface(nsIDOMNode::GetIID(), (void**) &domElement))) {
         rv = GetElementsByAttribute(domElement, aAttribute, aValue, elements);
         NS_RELEASE(domElement);
     }
diff --git a/mozilla/rdf/datasource/public/nsIXULContentSink.h b/mozilla/rdf/datasource/public/nsIXULContentSink.h
index 12cb5431b10..d040fd948a2 100644
--- a/mozilla/rdf/datasource/public/nsIXULContentSink.h
+++ b/mozilla/rdf/datasource/public/nsIXULContentSink.h
@@ -35,7 +35,7 @@ class nsIWebShell;
 class nsIXULContentSink : public nsIXMLContentSink
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IXULCONTENTSINK_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IXULCONTENTSINK_IID; return iid; }
 
     NS_IMETHOD Init(nsIDocument* aDocument,
                     nsIWebShell* aWebShell,
diff --git a/mozilla/rdf/datasource/src/nsXULContentSink.cpp b/mozilla/rdf/datasource/src/nsXULContentSink.cpp
index 41374c82da6..c7d5121b830 100644
--- a/mozilla/rdf/datasource/src/nsXULContentSink.cpp
+++ b/mozilla/rdf/datasource/src/nsXULContentSink.cpp
@@ -572,7 +572,7 @@ XULContentSinkImpl::LoadStyleSheet(nsIURL* aURL,
     nsCOMPtr<nsICSSParser> parser;
     if (NS_FAILED(rv = nsRepository::CreateInstance(kCSSParserCID,
                                                     nsnull,
-                                                    nsICSSParser::IID(),
+                                                    nsICSSParser::GetIID(),
                                                     (void**) getter_AddRefs(parser)))) {
         NS_ERROR("unable to create CSS parser");
         return rv;
@@ -594,7 +594,7 @@ XULContentSinkImpl::LoadStyleSheet(nsIURL* aURL,
 
     if (nsnull != aOwner) {
         nsIDOMNode* domNode;
-        if (NS_SUCCEEDED(aOwner->QueryInterface(nsIDOMNode::IID(), (void**)&domNode))) {
+        if (NS_SUCCEEDED(aOwner->QueryInterface(nsIDOMNode::GetIID(), (void**)&domNode))) {
             sheet->SetOwningNode(domNode);
             NS_RELEASE(domNode);
         }
@@ -1122,7 +1122,7 @@ XULContentSinkImpl::OpenTag(const nsIParserNode& aNode)
         mHaveSetRootResource = PR_TRUE;
 
         nsCOMPtr<nsIRDFDocument> rdfDoc;
-        if (NS_SUCCEEDED(mDocument->QueryInterface(nsIRDFDocument::IID(),
+        if (NS_SUCCEEDED(mDocument->QueryInterface(nsIRDFDocument::GetIID(),
                                                    (void**) getter_AddRefs(rdfDoc)))) {
             if (NS_FAILED(rv = rdfDoc->SetRootResource(rdfResource))) {
                 NS_ERROR("couldn't set root resource");
diff --git a/mozilla/rdf/util/src/nsRDFCursorUtils.cpp b/mozilla/rdf/util/src/nsRDFCursorUtils.cpp
index 71cd363537b..a63d6a2187d 100644
--- a/mozilla/rdf/util/src/nsRDFCursorUtils.cpp
+++ b/mozilla/rdf/util/src/nsRDFCursorUtils.cpp
@@ -143,9 +143,9 @@ nsRDFSingletonAssertionCursor::QueryInterface(REFNSIID iid, void** result)
     if (!result)
         return NS_ERROR_NULL_POINTER;
 
-    if (iid.Equals(nsIRDFAssertionCursor::IID()) ||
-        iid.Equals(nsIRDFCursor::IID()) ||
-        iid.Equals(::nsISupports::IID())) {
+    if (iid.Equals(nsIRDFAssertionCursor::GetIID()) ||
+        iid.Equals(nsIRDFCursor::GetIID()) ||
+        iid.Equals(::nsISupports::GetIID())) {
         *result = NS_STATIC_CAST(nsIRDFAssertionCursor*, this);
         AddRef();
         return NS_OK;
@@ -283,8 +283,8 @@ nsRDFEnumeratorCursor::QueryInterface(REFNSIID iid, void** result)
     if (!result)
         return NS_ERROR_NULL_POINTER;
 
-    if (iid.Equals(nsIRDFCursor::IID()) ||
-        iid.Equals(::nsISupports::IID())) {
+    if (iid.Equals(nsIRDFCursor::GetIID()) ||
+        iid.Equals(::nsISupports::GetIID())) {
         *result = NS_STATIC_CAST(nsIRDFCursor*, this);
         AddRef();
         return NS_OK;
diff --git a/mozilla/rdf/util/src/nsRDFResource.cpp b/mozilla/rdf/util/src/nsRDFResource.cpp
index a8f39dd2b21..4b2da760c28 100644
--- a/mozilla/rdf/util/src/nsRDFResource.cpp
+++ b/mozilla/rdf/util/src/nsRDFResource.cpp
@@ -39,7 +39,7 @@ nsRDFResource::nsRDFResource(void)
 
     if (gRefCnt++ == 0) {
         nsresult rv = nsServiceManager::GetService(kRDFServiceCID,
-                                                   nsIRDFService::IID(),
+                                                   nsIRDFService::GetIID(),
                                                    (nsISupports**) &gRDFService);
 
         NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get RDF service");
@@ -70,8 +70,8 @@ nsRDFResource::QueryInterface(REFNSIID iid, void** result)
         return NS_ERROR_NULL_POINTER;
 
     *result = nsnull;
-    if (iid.Equals(nsIRDFResource::IID()) ||
-        iid.Equals(nsIRDFNode::IID()) ||
+    if (iid.Equals(nsIRDFResource::GetIID()) ||
+        iid.Equals(nsIRDFNode::GetIID()) ||
         iid.Equals(kISupportsIID)) {
         *result = NS_STATIC_CAST(nsIRDFResource*, this);
         AddRef();
@@ -99,7 +99,7 @@ nsRDFResource::EqualsNode(nsIRDFNode* node, PRBool* result) const
 {
     nsresult rv;
     nsIRDFResource* resource;
-    if (NS_SUCCEEDED(node->QueryInterface(nsIRDFResource::IID(), (void**)&resource))) {
+    if (NS_SUCCEEDED(node->QueryInterface(nsIRDFResource::GetIID(), (void**)&resource))) {
         rv = EqualsResource(resource, result);
         NS_RELEASE(resource);
     }
diff --git a/mozilla/silentdl/nsIDOMSilentDownload.h b/mozilla/silentdl/nsIDOMSilentDownload.h
index a8d7b428105..059e98a0ae6 100644
--- a/mozilla/silentdl/nsIDOMSilentDownload.h
+++ b/mozilla/silentdl/nsIDOMSilentDownload.h
@@ -32,7 +32,7 @@ class nsIDOMSilentDownloadTask;
 
 class nsIDOMSilentDownload : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSILENTDOWNLOAD_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSILENTDOWNLOAD_IID; return iid; }
 
   NS_IMETHOD    GetByteRange(PRInt32* aByteRange)=0;
   NS_IMETHOD    SetByteRange(PRInt32 aByteRange)=0;
diff --git a/mozilla/silentdl/nsIDOMSilentDownloadTask.h b/mozilla/silentdl/nsIDOMSilentDownloadTask.h
index 87f607aae62..3f0de0f131d 100644
--- a/mozilla/silentdl/nsIDOMSilentDownloadTask.h
+++ b/mozilla/silentdl/nsIDOMSilentDownloadTask.h
@@ -31,7 +31,7 @@
 
 class nsIDOMSilentDownloadTask : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMSILENTDOWNLOADTASK_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMSILENTDOWNLOADTASK_IID; return iid; }
   enum {
     SDL_NOT_INITED = -2,
     SDL_NOT_ADDED = -1,
diff --git a/mozilla/widget/public/nsIContentConnector.h b/mozilla/widget/public/nsIContentConnector.h
index 108d35d2e4b..24ce5111d7b 100644
--- a/mozilla/widget/public/nsIContentConnector.h
+++ b/mozilla/widget/public/nsIContentConnector.h
@@ -30,7 +30,7 @@ class nsIContent;
 class nsIContentConnector : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ICONTENTCONNECTOR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ICONTENTCONNECTOR_IID; return iid; }
 
   NS_IMETHOD SetContentRoot(nsIContent* pContent) = 0;
 
diff --git a/mozilla/widget/public/nsIMenu.h b/mozilla/widget/public/nsIMenu.h
index 3fa2325434c..86867018e86 100644
--- a/mozilla/widget/public/nsIMenu.h
+++ b/mozilla/widget/public/nsIMenu.h
@@ -39,7 +39,7 @@ class nsIMenuListener;
 class nsIMenu : public nsISupports {
 
   public:
-    static const nsIID& IID() { static nsIID iid = NS_IMENU_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IMENU_IID; return iid; }
 
   /**
     * Creates the Menu and adds it the MenuBar
diff --git a/mozilla/widget/public/nsIMenuBar.h b/mozilla/widget/public/nsIMenuBar.h
index 61de8ce5ee3..a9f173dd538 100644
--- a/mozilla/widget/public/nsIMenuBar.h
+++ b/mozilla/widget/public/nsIMenuBar.h
@@ -36,7 +36,7 @@ class nsIWidget;
 class nsIMenuBar : public nsISupports {
 
   public:
-     static const nsIID& IID() { static nsIID iid = NS_IMENUBAR_IID; return iid; }
+     static const nsIID& GetIID() { static nsIID iid = NS_IMENUBAR_IID; return iid; }
 
    /**
     * Creates the MenuBar
diff --git a/mozilla/widget/public/nsIMenuItem.h b/mozilla/widget/public/nsIMenuItem.h
index d53bf14d8ac..954a10eb377 100644
--- a/mozilla/widget/public/nsIMenuItem.h
+++ b/mozilla/widget/public/nsIMenuItem.h
@@ -38,7 +38,7 @@ class nsIMenuListener;
 class nsIMenuItem : public nsISupports {
 
   public:
-    static const nsIID& IID() { static nsIID iid = NS_IMENUITEM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IMENUITEM_IID; return iid; }
 
    /**
     * Creates the MenuItem
diff --git a/mozilla/widget/public/nsIMenuListener.h b/mozilla/widget/public/nsIMenuListener.h
index 19ec3ee69fb..59e71f4ad13 100644
--- a/mozilla/widget/public/nsIMenuListener.h
+++ b/mozilla/widget/public/nsIMenuListener.h
@@ -40,7 +40,7 @@ static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID);
 class nsIMenuListener : public nsISupports {
 
   public:
-    static const nsIID& IID() { static nsIID iid = NS_IMENULISTENER_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IMENULISTENER_IID; return iid; }
 
     /**
      * Processes a menu selected event
diff --git a/mozilla/widget/public/nsIPopUpMenu.h b/mozilla/widget/public/nsIPopUpMenu.h
index d504d49aa39..12881758483 100644
--- a/mozilla/widget/public/nsIPopUpMenu.h
+++ b/mozilla/widget/public/nsIPopUpMenu.h
@@ -37,7 +37,7 @@ class nsIWidget;
 class nsIPopUpMenu : public nsISupports {
 
   public:
-    static const nsIID& IID() { static nsIID iid = NS_IPOPUPMENU_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IPOPUPMENU_IID; return iid; }
 
    /**
     * Creates the PopUpMenu
diff --git a/mozilla/widget/public/nsISelectionMgr.h b/mozilla/widget/public/nsISelectionMgr.h
index aa3002dc288..9c9e5e5a580 100644
--- a/mozilla/widget/public/nsISelectionMgr.h
+++ b/mozilla/widget/public/nsISelectionMgr.h
@@ -38,7 +38,7 @@
 class nsISelectionMgr : public nsISupports
 {
 public:
-  static const nsIID& IID()
+  static const nsIID& GetIID()
     { static nsIID iid = NS_ISELECTIONMGR_IID; return iid; }
     
   NS_IMETHOD GetCopyOStream(ostream** aStream) = 0;
diff --git a/mozilla/widget/public/nsIToolbar.h b/mozilla/widget/public/nsIToolbar.h
index 2bc74b9a56e..3bfb4034704 100644
--- a/mozilla/widget/public/nsIToolbar.h
+++ b/mozilla/widget/public/nsIToolbar.h
@@ -44,7 +44,7 @@ enum nsToolbarBorderType {
 class nsIToolbar : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ITOOLBAR_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITOOLBAR_IID; return iid; }
 
  /**
   * Adds a widget to the toolbar and indicates the left side gap
diff --git a/mozilla/widget/public/nsIToolbarItem.h b/mozilla/widget/public/nsIToolbarItem.h
index d51355dd831..6ffbe8970b3 100644
--- a/mozilla/widget/public/nsIToolbarItem.h
+++ b/mozilla/widget/public/nsIToolbarItem.h
@@ -32,7 +32,7 @@ class nsIToolbarItem : public nsISupports
 {
 
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ITOOLBARITEM_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITOOLBARITEM_IID; return iid; }
 
     /**
      * Forces the item to repaint 
diff --git a/mozilla/widget/public/nsIToolbarManagerListener.h b/mozilla/widget/public/nsIToolbarManagerListener.h
index 8bbb983fb29..5ffe9a98d34 100644
--- a/mozilla/widget/public/nsIToolbarManagerListener.h
+++ b/mozilla/widget/public/nsIToolbarManagerListener.h
@@ -32,7 +32,7 @@ class nsIToolbarManagerListener : public nsISupports
 {
 
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ITOOLBARMANAGERLISTENER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ITOOLBARMANAGERLISTENER_IID; return iid; }
 
  /**
   * Notifies 
diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h
index f7cf6348fe5..51e27fc5f41 100644
--- a/mozilla/widget/public/nsIWidget.h
+++ b/mozilla/widget/public/nsIWidget.h
@@ -154,7 +154,7 @@ class nsIWidget : public nsISupports {
 
   public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IWIDGET_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IWIDGET_IID; return iid; }
 
     /**
      * Create and initialize a widget. 
diff --git a/mozilla/widget/src/gtk/nsSelectionMgr.cpp b/mozilla/widget/src/gtk/nsSelectionMgr.cpp
index 2de644eba94..60228ca9daa 100644
--- a/mozilla/widget/src/gtk/nsSelectionMgr.cpp
+++ b/mozilla/widget/src/gtk/nsSelectionMgr.cpp
@@ -71,13 +71,13 @@ nsresult nsSelectionMgr::QueryInterface(const nsIID& aIID,
   {
     return NS_ERROR_NULL_POINTER;
   }
-  if (aIID.Equals(nsISupports::IID())) 
+  if (aIID.Equals(nsISupports::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISupports*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsISelectionMgr::IID())) 
+  if (aIID.Equals(nsISelectionMgr::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISelectionMgr*)this;
     NS_ADDREF_THIS();
diff --git a/mozilla/widget/src/mac/nsSelectionMgr.cpp b/mozilla/widget/src/mac/nsSelectionMgr.cpp
index 0a267989705..059cef59a8f 100644
--- a/mozilla/widget/src/mac/nsSelectionMgr.cpp
+++ b/mozilla/widget/src/mac/nsSelectionMgr.cpp
@@ -46,13 +46,13 @@ nsresult nsSelectionMgr::QueryInterface(const nsIID& aIID,
   {
     return NS_ERROR_NULL_POINTER;
   }
-  if (aIID.Equals(nsISupports::IID())) 
+  if (aIID.Equals(nsISupports::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISupports*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsISelectionMgr::IID())) 
+  if (aIID.Equals(nsISelectionMgr::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISelectionMgr*)this;
     NS_ADDREF_THIS();
@@ -100,7 +100,7 @@ nsresult nsSelectionMgr::CopyToClipboard()
 nsresult NS_NewSelectionMgr(nsISelectionMgr** aInstancePtrResult)
 {
   nsSelectionMgr* sm = new nsSelectionMgr();
-  return sm->QueryInterface(nsISelectionMgr::IID(),
+  return sm->QueryInterface(nsISelectionMgr::GetIID(),
                             (void**) aInstancePtrResult);
 }
 
diff --git a/mozilla/widget/src/windows/nsRadioGroup.cpp b/mozilla/widget/src/windows/nsRadioGroup.cpp
index 6f637f22d38..b895dede3ac 100644
--- a/mozilla/widget/src/windows/nsRadioGroup.cpp
+++ b/mozilla/widget/src/windows/nsRadioGroup.cpp
@@ -293,9 +293,9 @@ nsRadioGroup::Enumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
diff --git a/mozilla/widget/src/windows/nsSelectionMgr.cpp b/mozilla/widget/src/windows/nsSelectionMgr.cpp
index 525436747d9..a7f022be6d2 100644
--- a/mozilla/widget/src/windows/nsSelectionMgr.cpp
+++ b/mozilla/widget/src/windows/nsSelectionMgr.cpp
@@ -48,13 +48,13 @@ nsresult nsSelectionMgr::QueryInterface(const nsIID& aIID,
   {
     return NS_ERROR_NULL_POINTER;
   }
-  if (aIID.Equals(nsISupports::IID())) 
+  if (aIID.Equals(nsISupports::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISupports*)this;
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(nsISelectionMgr::IID())) 
+  if (aIID.Equals(nsISelectionMgr::GetIID())) 
   {
     *aInstancePtrResult = (void*)(nsISelectionMgr*)this;
     NS_ADDREF_THIS();
@@ -170,7 +170,7 @@ nsresult nsSelectionMgr::CopyToClipboard()
 nsresult NS_NewSelectionMgr(nsISelectionMgr** aInstancePtrResult)
 {
   nsSelectionMgr* sm = new nsSelectionMgr();
-  return sm->QueryInterface(nsISelectionMgr::IID(),
+  return sm->QueryInterface(nsISelectionMgr::GetIID(),
                             (void**) aInstancePtrResult);
 }
 
diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index 5df274c00f7..5a77801c76d 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -38,9 +38,9 @@ nsBaseWidget::Enumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
diff --git a/mozilla/xpcom/base/nsCOMPtr.h b/mozilla/xpcom/base/nsCOMPtr.h
index 4d1dd441270..a36f505dca7 100644
--- a/mozilla/xpcom/base/nsCOMPtr.h
+++ b/mozilla/xpcom/base/nsCOMPtr.h
@@ -313,7 +313,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr( const nsQueryInterface& aSmartPtr )
           // : nsCOMPtr_base(0)
         {
-          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::IID(), aSmartPtr.mErrorPtr);
+          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::GetIID(), aSmartPtr.mErrorPtr);
         }
 
       nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
@@ -339,7 +339,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr<T>&
       operator=( const nsQueryInterface& rhs )
         {
-          assign_with_QueryInterface(rhs.mRawPtr, T::IID(), rhs.mErrorPtr);
+          assign_with_QueryInterface(rhs.mRawPtr, T::GetIID(), rhs.mErrorPtr);
           return *this;
         }
 
diff --git a/mozilla/xpcom/base/nsIAllocator.h b/mozilla/xpcom/base/nsIAllocator.h
index 9a56dd5fd59..8a1b9cb2083 100644
--- a/mozilla/xpcom/base/nsIAllocator.h
+++ b/mozilla/xpcom/base/nsIAllocator.h
@@ -36,7 +36,7 @@
 
 class nsIAllocator : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IALLOCATOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IALLOCATOR_IID; return iid; }
     
     /**
      * Allocates a block of memory of a particular size. 
diff --git a/mozilla/xpcom/components/nsGenericFactory.cpp b/mozilla/xpcom/components/nsGenericFactory.cpp
index 1f7f1b3c6c1..b0c57df49e2 100644
--- a/mozilla/xpcom/components/nsGenericFactory.cpp
+++ b/mozilla/xpcom/components/nsGenericFactory.cpp
@@ -35,9 +35,9 @@ NS_METHOD nsGenericFactory::QueryInterface(const nsIID& aIID, void** aInstancePt
     if (NULL == aInstancePtr) {                                            
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
-    if (aIID.Equals(nsIFactory::IID()) ||
-    	aIID.Equals(nsIGenericFactory::IID()) ||
-        aIID.Equals(nsISupports::IID())) {
+    if (aIID.Equals(nsIFactory::GetIID()) ||
+    	aIID.Equals(nsIGenericFactory::GetIID()) ||
+        aIID.Equals(nsISupports::GetIID())) {
         *aInstancePtr = (void*) this;
         AddRef();
         return NS_OK; 
diff --git a/mozilla/xpcom/components/nsIFactory.h b/mozilla/xpcom/components/nsIFactory.h
index 861d86e1465..a917b254119 100644
--- a/mozilla/xpcom/components/nsIFactory.h
+++ b/mozilla/xpcom/components/nsIFactory.h
@@ -45,7 +45,7 @@ typedef nsID nsCID;
 
 class nsIFactory: public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFACTORY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFACTORY_IID; return iid; }
 
   NS_IMETHOD CreateInstance(nsISupports *aOuter,
                             REFNSIID aIID,
@@ -68,7 +68,7 @@ public:
 
 class nsIFactory2: public nsIFactory {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFACTORY2_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFACTORY2_IID; return iid; }
 
   NS_IMETHOD CreateInstance2(nsISupports *aOuter,
                              REFNSIID aIID,
diff --git a/mozilla/xpcom/components/nsIGenericFactory.h b/mozilla/xpcom/components/nsIGenericFactory.h
index 02629c5d7f2..400d03296d6 100644
--- a/mozilla/xpcom/components/nsIGenericFactory.h
+++ b/mozilla/xpcom/components/nsIGenericFactory.h
@@ -35,7 +35,7 @@
  */
 class nsIGenericFactory : public nsIFactory {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
     
     typedef NS_CALLBACK(ConstructorProcPtr) (nsISupports *aOuter, REFNSIID aIID, void **aResult);
     typedef NS_CALLBACK(DestructorProcPtr) (void);
diff --git a/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp b/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp
index 57812b3118c..a5c546d4cc6 100644
--- a/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp
+++ b/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp
@@ -65,9 +65,9 @@ nsConjoiningEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
@@ -113,7 +113,7 @@ nsConjoiningEnumerator:: Last(void)
 {
   nsresult rv;
   nsIBidirectionalEnumerator* be;
-  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
   if (NS_FAILED(rv)) return rv;
   mCurrent = mSecond;
   rv = be->Last();
@@ -126,12 +126,12 @@ nsConjoiningEnumerator:: Prev(void)
 {
   nsresult rv;
   nsIBidirectionalEnumerator* be;
-  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
   if (NS_FAILED(rv)) return rv;
   rv = be->Prev();
   NS_RELEASE(be);
   if (NS_FAILED(rv) && mCurrent == mSecond) {
-    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
     if (NS_FAILED(rv)) return rv;
     mCurrent = mFirst;
     rv = be->Last();
diff --git a/mozilla/xpcom/ds/nsIAtom.h b/mozilla/xpcom/ds/nsIAtom.h
index 0c52aea1b4d..f3fc836ef30 100644
--- a/mozilla/xpcom/ds/nsIAtom.h
+++ b/mozilla/xpcom/ds/nsIAtom.h
@@ -35,7 +35,7 @@ class nsISizeOfHandler;
  */
 class nsIAtom : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IATOM_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IATOM_IID; return iid; }
 
   /**
    * Translate the unicode string into the stringbuf.
diff --git a/mozilla/xpcom/ds/nsISupportsArray.h b/mozilla/xpcom/ds/nsISupportsArray.h
index 63fffcfbcaa..d2238d34faf 100644
--- a/mozilla/xpcom/ds/nsISupportsArray.h
+++ b/mozilla/xpcom/ds/nsISupportsArray.h
@@ -34,7 +34,7 @@ typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
 
 class nsISupportsArray : public nsICollection {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
 
   NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
   NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) const = 0;
diff --git a/mozilla/xpcom/ds/nsSupportsArray.cpp b/mozilla/xpcom/ds/nsSupportsArray.cpp
index 158013795b1..f420ec1966b 100644
--- a/mozilla/xpcom/ds/nsSupportsArray.cpp
+++ b/mozilla/xpcom/ds/nsSupportsArray.cpp
@@ -34,7 +34,7 @@ nsSupportsArray::~nsSupportsArray()
   DeleteArray();
 }
 
-NS_IMPL_ISUPPORTS(nsSupportsArray, nsISupportsArray::IID());
+NS_IMPL_ISUPPORTS(nsSupportsArray, nsISupportsArray::GetIID());
 
 void nsSupportsArray::DeleteArray(void)
 {
diff --git a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp
index d27977b961e..d70625cf4b4 100644
--- a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp
+++ b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp
@@ -41,9 +41,9 @@ nsSupportsArrayEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
diff --git a/mozilla/xpcom/glue/nsCOMPtr.h b/mozilla/xpcom/glue/nsCOMPtr.h
index 4d1dd441270..a36f505dca7 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.h
+++ b/mozilla/xpcom/glue/nsCOMPtr.h
@@ -313,7 +313,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr( const nsQueryInterface& aSmartPtr )
           // : nsCOMPtr_base(0)
         {
-          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::IID(), aSmartPtr.mErrorPtr);
+          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::GetIID(), aSmartPtr.mErrorPtr);
         }
 
       nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
@@ -339,7 +339,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr<T>&
       operator=( const nsQueryInterface& rhs )
         {
-          assign_with_QueryInterface(rhs.mRawPtr, T::IID(), rhs.mErrorPtr);
+          assign_with_QueryInterface(rhs.mRawPtr, T::GetIID(), rhs.mErrorPtr);
           return *this;
         }
 
diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp
index 1f7f1b3c6c1..b0c57df49e2 100644
--- a/mozilla/xpcom/glue/nsGenericFactory.cpp
+++ b/mozilla/xpcom/glue/nsGenericFactory.cpp
@@ -35,9 +35,9 @@ NS_METHOD nsGenericFactory::QueryInterface(const nsIID& aIID, void** aInstancePt
     if (NULL == aInstancePtr) {                                            
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
-    if (aIID.Equals(nsIFactory::IID()) ||
-    	aIID.Equals(nsIGenericFactory::IID()) ||
-        aIID.Equals(nsISupports::IID())) {
+    if (aIID.Equals(nsIFactory::GetIID()) ||
+    	aIID.Equals(nsIGenericFactory::GetIID()) ||
+        aIID.Equals(nsISupports::GetIID())) {
         *aInstancePtr = (void*) this;
         AddRef();
         return NS_OK; 
diff --git a/mozilla/xpcom/glue/nsIGenericFactory.h b/mozilla/xpcom/glue/nsIGenericFactory.h
index 02629c5d7f2..400d03296d6 100644
--- a/mozilla/xpcom/glue/nsIGenericFactory.h
+++ b/mozilla/xpcom/glue/nsIGenericFactory.h
@@ -35,7 +35,7 @@
  */
 class nsIGenericFactory : public nsIFactory {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
     
     typedef NS_CALLBACK(ConstructorProcPtr) (nsISupports *aOuter, REFNSIID aIID, void **aResult);
     typedef NS_CALLBACK(DestructorProcPtr) (void);
diff --git a/mozilla/xpcom/io/nsIBaseStream.h b/mozilla/xpcom/io/nsIBaseStream.h
index a360cfee093..ffef4d25c15 100644
--- a/mozilla/xpcom/io/nsIBaseStream.h
+++ b/mozilla/xpcom/io/nsIBaseStream.h
@@ -31,7 +31,7 @@
 class nsIBaseStream : public nsISupports {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IBASESTREAM_IID; return iid; }
 
     /** Close the stream. */
     NS_IMETHOD
diff --git a/mozilla/xpcom/io/nsIFileStream.cpp b/mozilla/xpcom/io/nsIFileStream.cpp
index 89cca04cd0a..13bc8191ab7 100644
--- a/mozilla/xpcom/io/nsIFileStream.cpp
+++ b/mozilla/xpcom/io/nsIFileStream.cpp
@@ -162,7 +162,7 @@ class FileImpl
 }; // class FileImpl
 
 #define SAY_I_IMPLEMENT(classname)        \
-  if (aIID.Equals(classname::IID()))                  \
+  if (aIID.Equals(classname::GetIID()))        \
   {                                            \
       *aInstancePtr = (void*)((classname*)this); \
       NS_ADDREF_THIS();                        \
@@ -190,13 +190,13 @@ NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   // of nsISupports), one through
   // nsIOutputStream, the other through nsIInputStream.  Resolve this
   // by giving them a specific one
-  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsIBaseStream*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsIBaseStream*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
       return NS_OK;
   }
-  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->IID()))
+  if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID()))
   {
       *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this);
       NS_ADDREF_THIS();
diff --git a/mozilla/xpcom/io/nsIFileStream.h b/mozilla/xpcom/io/nsIFileStream.h
index 7611b73c060..22198534ede 100644
--- a/mozilla/xpcom/io/nsIFileStream.h
+++ b/mozilla/xpcom/io/nsIFileStream.h
@@ -36,7 +36,7 @@ class nsIFile
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILE_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILE_IID; return iid; }
 	NS_IMETHOD                         Open(
                                            const nsFileSpec& inFile,
                                            int nsprMode,
@@ -67,7 +67,7 @@ class nsIFileInputStream
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
 }; // class nsIFileInputStream
 
 /* a6cf90e7-15b3-11d2-932e-00805f8add32 */
@@ -84,7 +84,7 @@ class nsIFileOutputStream
 : public nsISupports
 {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
     NS_IMETHOD                         Flush() = 0;
                                            // Forces a write to disk.
 }; // class nsIFileOutputStream
diff --git a/mozilla/xpcom/io/nsIInputStream.h b/mozilla/xpcom/io/nsIInputStream.h
index 67dac59561b..055bb2658fd 100644
--- a/mozilla/xpcom/io/nsIInputStream.h
+++ b/mozilla/xpcom/io/nsIInputStream.h
@@ -28,7 +28,7 @@
 class nsIInputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IINPUTSTREAM_IID; return iid; }
 
     /** Return the number of bytes in the stream
      *  @param aLength out parameter to hold the length
diff --git a/mozilla/xpcom/io/nsIOutputStream.h b/mozilla/xpcom/io/nsIOutputStream.h
index aa7d447b2ee..659c54a3eda 100644
--- a/mozilla/xpcom/io/nsIOutputStream.h
+++ b/mozilla/xpcom/io/nsIOutputStream.h
@@ -29,7 +29,7 @@
 class nsIOutputStream : public nsIBaseStream {
 public:
 
-    static const nsIID& IID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IOUTPUTSTREAM_IID; return iid; }
 
     /** Write data into the stream.
      *  @param aBuf the buffer into which the data is read
diff --git a/mozilla/xpcom/public/nsCOMPtr.h b/mozilla/xpcom/public/nsCOMPtr.h
index 4d1dd441270..a36f505dca7 100644
--- a/mozilla/xpcom/public/nsCOMPtr.h
+++ b/mozilla/xpcom/public/nsCOMPtr.h
@@ -313,7 +313,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr( const nsQueryInterface& aSmartPtr )
           // : nsCOMPtr_base(0)
         {
-          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::IID(), aSmartPtr.mErrorPtr);
+          assign_with_QueryInterface(aSmartPtr.mRawPtr, T::GetIID(), aSmartPtr.mErrorPtr);
         }
 
       nsCOMPtr( const nsDontAddRef<T>& aSmartPtr )
@@ -339,7 +339,7 @@ class nsCOMPtr : private nsCOMPtr_base
       nsCOMPtr<T>&
       operator=( const nsQueryInterface& rhs )
         {
-          assign_with_QueryInterface(rhs.mRawPtr, T::IID(), rhs.mErrorPtr);
+          assign_with_QueryInterface(rhs.mRawPtr, T::GetIID(), rhs.mErrorPtr);
           return *this;
         }
 
diff --git a/mozilla/xpcom/public/nsIAllocator.h b/mozilla/xpcom/public/nsIAllocator.h
index 9a56dd5fd59..8a1b9cb2083 100644
--- a/mozilla/xpcom/public/nsIAllocator.h
+++ b/mozilla/xpcom/public/nsIAllocator.h
@@ -36,7 +36,7 @@
 
 class nsIAllocator : public nsISupports {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IALLOCATOR_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IALLOCATOR_IID; return iid; }
     
     /**
      * Allocates a block of memory of a particular size. 
diff --git a/mozilla/xpcom/public/nsIFactory.h b/mozilla/xpcom/public/nsIFactory.h
index 861d86e1465..a917b254119 100644
--- a/mozilla/xpcom/public/nsIFactory.h
+++ b/mozilla/xpcom/public/nsIFactory.h
@@ -45,7 +45,7 @@ typedef nsID nsCID;
 
 class nsIFactory: public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFACTORY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFACTORY_IID; return iid; }
 
   NS_IMETHOD CreateInstance(nsISupports *aOuter,
                             REFNSIID aIID,
@@ -68,7 +68,7 @@ public:
 
 class nsIFactory2: public nsIFactory {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IFACTORY2_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IFACTORY2_IID; return iid; }
 
   NS_IMETHOD CreateInstance2(nsISupports *aOuter,
                              REFNSIID aIID,
diff --git a/mozilla/xpcom/public/nsIGenericFactory.h b/mozilla/xpcom/public/nsIGenericFactory.h
index 02629c5d7f2..400d03296d6 100644
--- a/mozilla/xpcom/public/nsIGenericFactory.h
+++ b/mozilla/xpcom/public/nsIGenericFactory.h
@@ -35,7 +35,7 @@
  */
 class nsIGenericFactory : public nsIFactory {
 public:
-    static const nsIID& IID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
+    static const nsIID& GetIID() { static nsIID iid = NS_IGENERICFACTORY_IID; return iid; }
     
     typedef NS_CALLBACK(ConstructorProcPtr) (nsISupports *aOuter, REFNSIID aIID, void **aResult);
     typedef NS_CALLBACK(DestructorProcPtr) (void);
diff --git a/mozilla/xpcom/public/nsISupports.h b/mozilla/xpcom/public/nsISupports.h
index 9fbf5b80b1a..bc42f15f44b 100644
--- a/mozilla/xpcom/public/nsISupports.h
+++ b/mozilla/xpcom/public/nsISupports.h
@@ -56,7 +56,7 @@ typedef nsID nsIID;
 
 #define NS_DEFINE_STATIC_IID_ACCESSOR(the_iid) \
   public: \
-  static const nsIID& IID() {static nsIID iid = the_iid; return iid;}
+  static const nsIID& GetIID() {static nsIID iid = the_iid; return iid;}
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -94,7 +94,7 @@ typedef PRUint32 nsrefcnt;
  */
 class nsISupports XPCOM_OBJECT {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
   /**
    * @name Methods
    */
@@ -295,7 +295,7 @@ nsrefcnt Class::Release(void)                                                 \
 nsresult Class::QueryInterface(REFNSIID aIID, void** aInstancePtr)            \
 {                                                                             \
   if (!aInstancePtr) return NS_ERROR_NULL_POINTER;                            \
-  if (aIID.Equals(AdditionalInterface::IID())) {                              \
+  if (aIID.Equals(AdditionalInterface::GetIID())) {                           \
     *aInstancePtr = NS_STATIC_CAST(AdditionalInterface*, this);               \
     NS_ADDREF_THIS();                                                         \
     return NS_OK;                                                             \
diff --git a/mozilla/xpcom/public/nsISupportsArray.h b/mozilla/xpcom/public/nsISupportsArray.h
index 63fffcfbcaa..d2238d34faf 100644
--- a/mozilla/xpcom/public/nsISupportsArray.h
+++ b/mozilla/xpcom/public/nsISupportsArray.h
@@ -34,7 +34,7 @@ typedef PRBool (*nsISupportsArrayEnumFunc)(nsISupports* aElement, void *aData);
 
 class nsISupportsArray : public nsICollection {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTSARRAY_IID; return iid; }
 
   NS_IMETHOD_(nsISupportsArray&) operator=(const nsISupportsArray& other) = 0;
   NS_IMETHOD_(PRBool) operator==(const nsISupportsArray& other) const = 0;
diff --git a/mozilla/xpcom/src/nsConjoiningEnumerator.cpp b/mozilla/xpcom/src/nsConjoiningEnumerator.cpp
index 57812b3118c..a5c546d4cc6 100644
--- a/mozilla/xpcom/src/nsConjoiningEnumerator.cpp
+++ b/mozilla/xpcom/src/nsConjoiningEnumerator.cpp
@@ -65,9 +65,9 @@ nsConjoiningEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
@@ -113,7 +113,7 @@ nsConjoiningEnumerator:: Last(void)
 {
   nsresult rv;
   nsIBidirectionalEnumerator* be;
-  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+  rv = mSecond->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
   if (NS_FAILED(rv)) return rv;
   mCurrent = mSecond;
   rv = be->Last();
@@ -126,12 +126,12 @@ nsConjoiningEnumerator:: Prev(void)
 {
   nsresult rv;
   nsIBidirectionalEnumerator* be;
-  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+  rv = mCurrent->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
   if (NS_FAILED(rv)) return rv;
   rv = be->Prev();
   NS_RELEASE(be);
   if (NS_FAILED(rv) && mCurrent == mSecond) {
-    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::IID(), (void**)&be);
+    rv = mFirst->QueryInterface(nsIBidirectionalEnumerator::GetIID(), (void**)&be);
     if (NS_FAILED(rv)) return rv;
     mCurrent = mFirst;
     rv = be->Last();
diff --git a/mozilla/xpcom/src/nsGenericFactory.cpp b/mozilla/xpcom/src/nsGenericFactory.cpp
index 1f7f1b3c6c1..b0c57df49e2 100644
--- a/mozilla/xpcom/src/nsGenericFactory.cpp
+++ b/mozilla/xpcom/src/nsGenericFactory.cpp
@@ -35,9 +35,9 @@ NS_METHOD nsGenericFactory::QueryInterface(const nsIID& aIID, void** aInstancePt
     if (NULL == aInstancePtr) {                                            
         return NS_ERROR_NULL_POINTER;                                        
     }                                                                      
-    if (aIID.Equals(nsIFactory::IID()) ||
-    	aIID.Equals(nsIGenericFactory::IID()) ||
-        aIID.Equals(nsISupports::IID())) {
+    if (aIID.Equals(nsIFactory::GetIID()) ||
+    	aIID.Equals(nsIGenericFactory::GetIID()) ||
+        aIID.Equals(nsISupports::GetIID())) {
         *aInstancePtr = (void*) this;
         AddRef();
         return NS_OK; 
diff --git a/mozilla/xpcom/src/nsSupportsArray.cpp b/mozilla/xpcom/src/nsSupportsArray.cpp
index 158013795b1..f420ec1966b 100644
--- a/mozilla/xpcom/src/nsSupportsArray.cpp
+++ b/mozilla/xpcom/src/nsSupportsArray.cpp
@@ -34,7 +34,7 @@ nsSupportsArray::~nsSupportsArray()
   DeleteArray();
 }
 
-NS_IMPL_ISUPPORTS(nsSupportsArray, nsISupportsArray::IID());
+NS_IMPL_ISUPPORTS(nsSupportsArray, nsISupportsArray::GetIID());
 
 void nsSupportsArray::DeleteArray(void)
 {
diff --git a/mozilla/xpcom/src/nsSupportsArrayEnumerator.cpp b/mozilla/xpcom/src/nsSupportsArrayEnumerator.cpp
index d27977b961e..d70625cf4b4 100644
--- a/mozilla/xpcom/src/nsSupportsArrayEnumerator.cpp
+++ b/mozilla/xpcom/src/nsSupportsArrayEnumerator.cpp
@@ -41,9 +41,9 @@ nsSupportsArrayEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   if (NULL == aInstancePtr)
     return NS_ERROR_NULL_POINTER; 
 
-  if (aIID.Equals(nsIBidirectionalEnumerator::IID()) || 
-      aIID.Equals(nsIEnumerator::IID()) || 
-      aIID.Equals(nsISupports::IID())) {
+  if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || 
+      aIID.Equals(nsIEnumerator::GetIID()) || 
+      aIID.Equals(nsISupports::GetIID())) {
     *aInstancePtr = (void*) this; 
     NS_ADDREF_THIS(); 
     return NS_OK; 
diff --git a/mozilla/xpcom/tests/TestCOMPtr.cpp b/mozilla/xpcom/tests/TestCOMPtr.cpp
index 4d6b909ff45..9d095a68e98 100644
--- a/mozilla/xpcom/tests/TestCOMPtr.cpp
+++ b/mozilla/xpcom/tests/TestCOMPtr.cpp
@@ -37,7 +37,7 @@
 class IFoo : public nsISupports
   {
 		public:
-			static const nsIID& IID() { static nsIID iid = NS_IFOO_IID; return iid; }
+			static const nsIID& GetIID() { static nsIID iid = NS_IFOO_IID; return iid; }
 
 		public:
       IFoo();
@@ -153,7 +153,7 @@ IFoo::QueryInterface( const nsIID& aIID, void** aResult )
 		nsISupports* rawPtr = 0;
 		nsresult status = NS_OK;
 
-		if ( aIID.Equals(IID()) )
+		if ( aIID.Equals(GetIID()) )
 			rawPtr = this;
 		else
 			{
@@ -215,7 +215,7 @@ return_a_IFoo()
 class IBar : public IFoo
   {
   	public:
-  		static const nsIID& IID() { static nsIID iid = NS_IBAR_IID; return iid; }
+  		static const nsIID& GetIID() { static nsIID iid = NS_IBAR_IID; return iid; }
 
     public:
       IBar();
@@ -241,9 +241,9 @@ IBar::QueryInterface( const nsID& aIID, void** aResult )
 		nsISupports* rawPtr = 0;
 		nsresult status = NS_OK;
 
-		if ( aIID.Equals(IID()) )
+		if ( aIID.Equals(GetIID()) )
 			rawPtr = this;
-		else if ( aIID.Equals(IFoo::IID()) )
+		else if ( aIID.Equals(IFoo::GetIID()) )
 			rawPtr = STATIC_CAST(IFoo*, this);
 		else
 			{
@@ -311,7 +311,7 @@ TestBloat_Raw()
 				try
 					{
 						IFoo* fooP = 0;
-						if ( NS_SUCCEEDED( result = barP->QueryInterface(IFoo::IID(), REINTERPRET_CAST(void**, &fooP)) ) )
+						if ( NS_SUCCEEDED( result = barP->QueryInterface(IFoo::GetIID(), REINTERPRET_CAST(void**, &fooP)) ) )
 							{
 								try
 									{
@@ -349,7 +349,7 @@ TestBloat_Raw_Unsafe()
 		if ( barP )
 			{
 				IFoo* fooP = 0;
-				if ( NS_SUCCEEDED( result = barP->QueryInterface(IFoo::IID(), REINTERPRET_CAST(void**, &fooP)) ) )
+				if ( NS_SUCCEEDED( result = barP->QueryInterface(IFoo::GetIID(), REINTERPRET_CAST(void**, &fooP)) ) )
 					{
 						fooP->print_totals();
 						NS_RELEASE(fooP);
diff --git a/mozilla/xpcom/tools/xpidl/xpidl_header.c b/mozilla/xpcom/tools/xpidl/xpidl_header.c
index 2955729d876..75424fc0dae 100644
--- a/mozilla/xpcom/tools/xpidl/xpidl_header.c
+++ b/mozilla/xpcom/tools/xpidl/xpidl_header.c
@@ -138,7 +138,7 @@ interface(TreeState *state)
     fputs(" {\n"
           " public: \n", state->file);
     if (iid) {
-        fputs("  static const nsIID& IID() {\n"
+        fputs("  static const nsIID& GetIID() {\n"
               "    static nsIID iid = ",
               state->file);
         if (!write_classname_iid_define(state->file, className))
diff --git a/mozilla/xpcom/typelib/xpidl/xpidl_header.c b/mozilla/xpcom/typelib/xpidl/xpidl_header.c
index 2955729d876..75424fc0dae 100644
--- a/mozilla/xpcom/typelib/xpidl/xpidl_header.c
+++ b/mozilla/xpcom/typelib/xpidl/xpidl_header.c
@@ -138,7 +138,7 @@ interface(TreeState *state)
     fputs(" {\n"
           " public: \n", state->file);
     if (iid) {
-        fputs("  static const nsIID& IID() {\n"
+        fputs("  static const nsIID& GetIID() {\n"
               "    static nsIID iid = ",
               state->file);
         if (!write_classname_iid_define(state->file, className))
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMAppCoresManager.h b/mozilla/xpfe/AppCores/public/nsIDOMAppCoresManager.h
index 4c8b1923da0..91ae494f426 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMAppCoresManager.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMAppCoresManager.h
@@ -32,7 +32,7 @@ class nsIDOMBaseAppCore;
 
 class nsIDOMAppCoresManager : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMAPPCORESMANAGER_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMAPPCORESMANAGER_IID; return iid; }
 
   NS_IMETHOD    Startup()=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMBaseAppCore.h b/mozilla/xpfe/AppCores/public/nsIDOMBaseAppCore.h
index 77384665517..e8d3948be17 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMBaseAppCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMBaseAppCore.h
@@ -31,7 +31,7 @@
 
 class nsIDOMBaseAppCore : public nsISupports {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMBASEAPPCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMBASEAPPCORE_IID; return iid; }
 
   NS_IMETHOD    GetId(nsString& aId)=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h b/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h
index b9ee5c4e005..d412ae19f90 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMBrowserAppCore.h
@@ -33,7 +33,7 @@ class nsIDOMWindow;
 
 class nsIDOMBrowserAppCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMBROWSERAPPCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMBROWSERAPPCORE_IID; return iid; }
 
   NS_IMETHOD    Back()=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMEditorAppCore.h b/mozilla/xpfe/AppCores/public/nsIDOMEditorAppCore.h
index cd490378514..96e66dcaa44 100755
--- a/mozilla/xpfe/AppCores/public/nsIDOMEditorAppCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMEditorAppCore.h
@@ -33,7 +33,7 @@ class nsIDOMWindow;
 
 class nsIDOMEditorAppCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMEDITORAPPCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMEDITORAPPCORE_IID; return iid; }
 
   NS_IMETHOD    SetAttribute(const nsString& aAttr, const nsString& aValue)=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMMailCore.h b/mozilla/xpfe/AppCores/public/nsIDOMMailCore.h
index 96bab410b3c..17e154a011d 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMMailCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMMailCore.h
@@ -33,7 +33,7 @@ class nsIDOMWindow;
 
 class nsIDOMMailCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMMAILCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMMAILCORE_IID; return iid; }
 
   NS_IMETHOD    SendMail(const nsString& aAddrTo, const nsString& aSubject, const nsString& aMsg)=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMRDFCore.h b/mozilla/xpfe/AppCores/public/nsIDOMRDFCore.h
index 87c9f824c1b..474269d065c 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMRDFCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMRDFCore.h
@@ -33,7 +33,7 @@ class nsIDOMNode;
 
 class nsIDOMRDFCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMRDFCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMRDFCORE_IID; return iid; }
 
   NS_IMETHOD    DoSort(nsIDOMNode* aNode, const nsString& aSortResource)=0;
 };
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMToolbarCore.h b/mozilla/xpfe/AppCores/public/nsIDOMToolbarCore.h
index 64ac2cce65b..b5715fc4752 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMToolbarCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMToolbarCore.h
@@ -33,7 +33,7 @@ class nsIDOMWindow;
 
 class nsIDOMToolbarCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMTOOLBARCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMTOOLBARCORE_IID; return iid; }
 
   NS_IMETHOD    SetWindow(nsIDOMWindow* aWin)=0;
 
diff --git a/mozilla/xpfe/AppCores/public/nsIDOMToolkitCore.h b/mozilla/xpfe/AppCores/public/nsIDOMToolkitCore.h
index 9b8af4a3f1b..04b215644b9 100644
--- a/mozilla/xpfe/AppCores/public/nsIDOMToolkitCore.h
+++ b/mozilla/xpfe/AppCores/public/nsIDOMToolkitCore.h
@@ -33,7 +33,7 @@ class nsIDOMWindow;
 
 class nsIDOMToolkitCore : public nsIDOMBaseAppCore {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IDOMTOOLKITCORE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IDOMTOOLKITCORE_IID; return iid; }
 
   NS_IMETHOD    ShowWindow(const nsString& aUrl, nsIDOMWindow* aParent)=0;
 };
diff --git a/mozilla/xpfe/AppCores/src/nsBaseAppCore.cpp b/mozilla/xpfe/AppCores/src/nsBaseAppCore.cpp
index 7b18c2cee38..d6132cd1390 100644
--- a/mozilla/xpfe/AppCores/src/nsBaseAppCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsBaseAppCore.cpp
@@ -31,8 +31,8 @@
 // Globals
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIScriptObjectOwnerIID,     NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIDOMBaseAppCoreIID,        nsIDOMBaseAppCore::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
+static NS_DEFINE_IID(kIDOMBaseAppCoreIID,        nsIDOMBaseAppCore::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
 
 
 /////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
index 5363831d226..96b58d51c2b 100644
--- a/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsBrowserAppCore.cpp
@@ -62,8 +62,8 @@ static NS_DEFINE_IID(kIAppShellServiceIID,       NS_IAPPSHELL_SERVICE_IID);
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIBrowserAppCoreIID,        NS_IDOMBROWSERAPPCORE_IID);
 
-static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
+static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
 
 
 static NS_DEFINE_IID(kINetSupportIID,            NS_INETSUPPORT_IID);
diff --git a/mozilla/xpfe/AppCores/src/nsEditorAppCore.cpp b/mozilla/xpfe/AppCores/src/nsEditorAppCore.cpp
index d8c737f99ac..c1929671857 100755
--- a/mozilla/xpfe/AppCores/src/nsEditorAppCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsEditorAppCore.cpp
@@ -86,8 +86,8 @@ static NS_DEFINE_IID(kIAppShellServiceIID,       NS_IAPPSHELL_SERVICE_IID);
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIEditorAppCoreIID,        NS_IDOMEDITORAPPCORE_IID);
 
-static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
+static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
 
 
 static NS_DEFINE_IID(kINetSupportIID,            NS_INETSUPPORT_IID);
diff --git a/mozilla/xpfe/AppCores/src/nsMailCore.cpp b/mozilla/xpfe/AppCores/src/nsMailCore.cpp
index 3fe56f7ea71..f2db9f66da7 100644
--- a/mozilla/xpfe/AppCores/src/nsMailCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsMailCore.cpp
@@ -38,8 +38,8 @@
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIMailCoreIID,              NS_IDOMMAILCORE_IID);
 
-static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
+static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
 
 static NS_DEFINE_IID(kMailCoreCID,               NS_MAILCORE_CID);
 static NS_DEFINE_IID(kBrowserWindowCID,          NS_BROWSER_WINDOW_CID);
diff --git a/mozilla/xpfe/AppCores/src/nsRDFCore.cpp b/mozilla/xpfe/AppCores/src/nsRDFCore.cpp
index 1e8d88e4d1b..b092b85839e 100644
--- a/mozilla/xpfe/AppCores/src/nsRDFCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsRDFCore.cpp
@@ -38,8 +38,8 @@
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIRDFCoreIID,               NS_IDOMRDFCORE_IID);
 
-static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
+static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
 
 static NS_DEFINE_IID(kRDFCoreCID,                NS_RDFCORE_CID);
 static NS_DEFINE_IID(kBrowserWindowCID,          NS_BROWSER_WINDOW_CID);
diff --git a/mozilla/xpfe/AppCores/src/nsToolbarCore.cpp b/mozilla/xpfe/AppCores/src/nsToolbarCore.cpp
index a544735117e..724eb1aee99 100644
--- a/mozilla/xpfe/AppCores/src/nsToolbarCore.cpp
+++ b/mozilla/xpfe/AppCores/src/nsToolbarCore.cpp
@@ -41,9 +41,9 @@
 static NS_DEFINE_IID(kISupportsIID,              NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIToolbarCoreIID,           NS_IDOMTOOLBARCORE_IID);
 
-static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::IID());
-static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::IID());
-static NS_DEFINE_IID(kIDOMCharacterDataIID,      nsIDOMCharacterData::IID());
+static NS_DEFINE_IID(kIDOMDocumentIID,           nsIDOMDocument::GetIID());
+static NS_DEFINE_IID(kIDocumentIID,              nsIDocument::GetIID());
+static NS_DEFINE_IID(kIDOMCharacterDataIID,      nsIDOMCharacterData::GetIID());
 
 static NS_DEFINE_IID(kToolbarCoreCID,            NS_TOOLBARCORE_CID);
 
diff --git a/mozilla/xpfe/appshell/public/nsIAppShellService.h b/mozilla/xpfe/appshell/public/nsIAppShellService.h
index 5d91476fb10..4114218158d 100644
--- a/mozilla/xpfe/appshell/public/nsIAppShellService.h
+++ b/mozilla/xpfe/appshell/public/nsIAppShellService.h
@@ -41,7 +41,7 @@ class nsIXULWindowCallbacks;
 class nsIAppShellService : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IAPPSHELL_SERVICE_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IAPPSHELL_SERVICE_IID; return iid; }
 
   NS_IMETHOD Initialize(void) = 0;
   NS_IMETHOD Run(void) = 0;
diff --git a/mozilla/xpfe/appshell/public/nsIWebShellWindow.h b/mozilla/xpfe/appshell/public/nsIWebShellWindow.h
index 6c7c5979c2f..3940e7516f1 100644
--- a/mozilla/xpfe/appshell/public/nsIWebShellWindow.h
+++ b/mozilla/xpfe/appshell/public/nsIWebShellWindow.h
@@ -34,7 +34,7 @@ class nsIWidget;
 class nsIWebShellWindow : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IWEBSHELL_WINDOW_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IWEBSHELL_WINDOW_IID; return iid; }
 
   NS_IMETHOD Show(PRBool aShow) = 0;
   NS_IMETHOD GetWebShell(nsIWebShell *& aWebShell) = 0;
diff --git a/mozilla/xpfe/appshell/public/nsIXULWindowCallbacks.h b/mozilla/xpfe/appshell/public/nsIXULWindowCallbacks.h
index 5a741cdb09b..e2b8dcc3365 100644
--- a/mozilla/xpfe/appshell/public/nsIXULWindowCallbacks.h
+++ b/mozilla/xpfe/appshell/public/nsIXULWindowCallbacks.h
@@ -30,7 +30,7 @@
 class nsIXULWindowCallbacks : public nsISupports
 {
 public:
-  static const nsIID& IID() { static nsIID iid = NS_IXULWINDOWCALLBACKS_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IXULWINDOWCALLBACKS_IID; return iid; }
 
   // this method will be called by the window creation code after
   // the UI has been loaded, before the window is visible, and before
diff --git a/mozilla/xpfe/appshell/src/nsIXULCommand.h b/mozilla/xpfe/appshell/src/nsIXULCommand.h
index dfd586f341b..583b09d44ae 100644
--- a/mozilla/xpfe/appshell/src/nsIXULCommand.h
+++ b/mozilla/xpfe/appshell/src/nsIXULCommand.h
@@ -41,7 +41,7 @@ class nsIMenuItem;
 class nsIXULCommand : public nsIMenuListener {
 public:
 
-  static const nsIID& IID() { static nsIID iid = NS_IXULCOMMAND_IID; return iid; }
+  static const nsIID& GetIID() { static nsIID iid = NS_IXULCOMMAND_IID; return iid; }
 
   /**
    * Sets the menu
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index d13d2f662fb..749d0d48b31 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -225,7 +225,7 @@ int main(int argc, char* argv[])
     const char *messengerProgID = "component://netscape/messenger";
     nsresult result = nsRepository::CreateInstance(messengerProgID,
                                                    nsnull,
-                                                   nsIAppShellService::IID(),
+                                                   nsIAppShellService::GetIID(),
                                                    (void **)&messenger);
     if (NS_SUCCEEDED(result)) {
       result = messenger->Initialize();