diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.cpp b/accessible/src/msaa/HyperTextAccessibleWrap.cpp
index 3421910fe41..f205f04e988 100644
--- a/accessible/src/msaa/HyperTextAccessibleWrap.cpp
+++ b/accessible/src/msaa/HyperTextAccessibleWrap.cpp
@@ -15,7 +15,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessibleWrap,
 IMPL_IUNKNOWN_INHERITED2(HyperTextAccessibleWrap,
                          AccessibleWrap,
                          ia2AccessibleHypertext,
-                         CAccessibleEditableText);
+                         ia2AccessibleEditableText);
 
 nsresult
 HyperTextAccessibleWrap::HandleAccEvent(AccEvent* aEvent)
diff --git a/accessible/src/msaa/HyperTextAccessibleWrap.h b/accessible/src/msaa/HyperTextAccessibleWrap.h
index fb474081bc1..25ccfdf708d 100644
--- a/accessible/src/msaa/HyperTextAccessibleWrap.h
+++ b/accessible/src/msaa/HyperTextAccessibleWrap.h
@@ -9,12 +9,12 @@
 #define mozilla_a11y_HyperTextAccessibleWrap_h__
 
 #include "HyperTextAccessible.h"
-#include "CAccessibleEditableText.h"
+#include "ia2AccessibleEditableText.h"
 #include "ia2AccessibleHyperText.h"
 
 class HyperTextAccessibleWrap : public HyperTextAccessible,
                                 public ia2AccessibleHypertext,
-                                public CAccessibleEditableText
+                                public ia2AccessibleEditableText
 {
 public:
   HyperTextAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
diff --git a/accessible/src/msaa/Makefile.in b/accessible/src/msaa/Makefile.in
index 53108c9b196..96081ebfdfd 100644
--- a/accessible/src/msaa/Makefile.in
+++ b/accessible/src/msaa/Makefile.in
@@ -26,7 +26,6 @@ CPPSRCS = \
   nsAccessNodeWrap.cpp \
   nsHTMLWin32ObjectAccessible.cpp \
   nsWinUtils.cpp \
-  CAccessibleEditableText.cpp \
   CAccessibleHyperlink.cpp \
   CAccessibleTable.cpp \
   CAccessibleTableCell.cpp \
@@ -35,6 +34,7 @@ CPPSRCS = \
   EnumVariant.cpp \
   ia2AccessibleAction.cpp \
   ia2AccessibleComponent.cpp \
+  ia2AccessibleEditableText.cpp \
   ia2AccessibleImage.cpp \
   ia2AccessibleHypertext.cpp \
   ia2AccessibleRelation.cpp \
diff --git a/accessible/src/msaa/CAccessibleEditableText.cpp b/accessible/src/msaa/ia2AccessibleEditableText.cpp
similarity index 71%
rename from accessible/src/msaa/CAccessibleEditableText.cpp
rename to accessible/src/msaa/ia2AccessibleEditableText.cpp
index 9f90aa1989a..8d3ef34e620 100644
--- a/accessible/src/msaa/CAccessibleEditableText.cpp
+++ b/accessible/src/msaa/ia2AccessibleEditableText.cpp
@@ -5,10 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "CAccessibleEditableText.h"
+#include "ia2AccessibleEditableText.h"
 
 #include "AccessibleEditableText_i.c"
-#include "HyperTextAccessible.h"
+#include "HyperTextAccessibleWrap.h"
 
 #include "nsCOMPtr.h"
 #include "nsString.h"
@@ -16,7 +16,7 @@
 // IUnknown
 
 STDMETHODIMP
-CAccessibleEditableText::QueryInterface(REFIID iid, void** ppv)
+ia2AccessibleEditableText::QueryInterface(REFIID iid, void** ppv)
 {
   *ppv = NULL;
 
@@ -35,10 +35,10 @@ CAccessibleEditableText::QueryInterface(REFIID iid, void** ppv)
 // IAccessibleEditableText
 
 STDMETHODIMP
-CAccessibleEditableText::copyText(long aStartOffset, long aEndOffset)
+ia2AccessibleEditableText::copyText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -50,10 +50,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::deleteText(long aStartOffset, long aEndOffset)
+ia2AccessibleEditableText::deleteText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -65,10 +65,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::insertText(long aOffset, BSTR *aText)
+ia2AccessibleEditableText::insertText(long aOffset, BSTR *aText)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -83,10 +83,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::cutText(long aStartOffset, long aEndOffset)
+ia2AccessibleEditableText::cutText(long aStartOffset, long aEndOffset)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -98,10 +98,10 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::pasteText(long aOffset)
+ia2AccessibleEditableText::pasteText(long aOffset)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -113,11 +113,11 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::replaceText(long aStartOffset, long aEndOffset,
-                                     BSTR *aText)
+ia2AccessibleEditableText::replaceText(long aStartOffset, long aEndOffset,
+                                       BSTR *aText)
 {
 __try {
-  nsRefPtr<HyperTextAccessible> textAcc(do_QueryObject(this));
+  HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
   if (textAcc->IsDefunct())
     return CO_E_OBJNOTCONNECTED;
 
@@ -136,8 +136,8 @@ __try {
 }
 
 STDMETHODIMP
-CAccessibleEditableText::setAttributes(long aStartOffset, long aEndOffset,
-                                       BSTR *aAttributes)
+ia2AccessibleEditableText::setAttributes(long aStartOffset, long aEndOffset,
+                                         BSTR *aAttributes)
 {
 __try {
 
diff --git a/accessible/src/msaa/CAccessibleEditableText.h b/accessible/src/msaa/ia2AccessibleEditableText.h
similarity index 96%
rename from accessible/src/msaa/CAccessibleEditableText.h
rename to accessible/src/msaa/ia2AccessibleEditableText.h
index 60e3a865aa8..5d95a6045e5 100644
--- a/accessible/src/msaa/CAccessibleEditableText.h
+++ b/accessible/src/msaa/ia2AccessibleEditableText.h
@@ -13,7 +13,7 @@
 
 #include "AccessibleEditableText.h"
 
-class CAccessibleEditableText: public IAccessibleEditableText
+class ia2AccessibleEditableText: public IAccessibleEditableText
 {
 public: