diff --git a/accessible/public/nsIAccessibleEditableText.idl b/accessible/public/nsIAccessibleEditableText.idl
index 56ca4a537a5f..146691590257 100644
--- a/accessible/public/nsIAccessibleEditableText.idl
+++ b/accessible/public/nsIAccessibleEditableText.idl
@@ -43,7 +43,7 @@
 
 interface nsIEditor;
 
-[scriptable, uuid(1e9884d3-4017-4032-a121-e0185d166db5)]
+[scriptable, uuid(52837507-202d-4e72-a482-5f068a1fd720)]
 interface nsIAccessibleEditableText : nsISupports
 {
   /**
@@ -105,9 +105,9 @@ interface nsIAccessibleEditableText : nsISupports
   void pasteText (in long position);
 
   /**
-   * Returns an editor.
+   * Returns an editor associated with the accessible.
    */
-  [noscript] readonly attribute nsIEditor editor;
+  [noscript] readonly attribute nsIEditor associatedEditor;
 };
 
 /*
diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index 11a826f3da19..7c94ec7b9f80 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -1135,7 +1135,7 @@ NS_IMETHODIMP nsHyperTextAccessible::PasteText(PRInt32 aPosition)
 }
 
 NS_IMETHODIMP
-nsHyperTextAccessible::GetEditor(nsIEditor **aEditor)
+nsHyperTextAccessible::GetAssociatedEditor(nsIEditor **aEditor)
 {
   NS_ENSURE_ARG_POINTER(aEditor);