diff --git a/accessible/base/nsAccessibilityService.cpp b/accessible/base/nsAccessibilityService.cpp
index bec7be36973b..bd761694c935 100644
--- a/accessible/base/nsAccessibilityService.cpp
+++ b/accessible/base/nsAccessibilityService.cpp
@@ -1055,13 +1055,13 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode,
         // A graphic elements: rect, circle, ellipse, line, path, polygon,
         // polyline and image. A 'use' and 'text' graphic elements require
         // special support.
-        newAcc = new RoleTAccessible<roles::GRAPHIC>(content, document);
+        newAcc = new EnumRoleAccessible<roles::GRAPHIC>(content, document);
       } else if (content->IsSVGElement(nsGkAtoms::svg)) {
-        newAcc = new RoleTAccessible<roles::DIAGRAM>(content, document);
+        newAcc = new EnumRoleAccessible<roles::DIAGRAM>(content, document);
       }
     } else if (content->IsMathMLElement()) {
       if (content->IsMathMLElement(nsGkAtoms::math))
-        newAcc = new RoleTAccessible<roles::EQUATION>(content, document);
+        newAcc = new EnumRoleAccessible<roles::EQUATION>(content, document);
       else
         newAcc = new HyperTextAccessible(content, document);
     }
@@ -1307,14 +1307,14 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
     accessible = new XULMenuSeparatorAccessible(aContent, aDoc);
 
   } else if(role.EqualsLiteral("xul:pane")) {
-    accessible = new RoleTAccessible<roles::PANE>(aContent, aDoc);
+    accessible = new EnumRoleAccessible<roles::PANE>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:panel")) {
     if (aContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::noautofocus,
                               nsGkAtoms::_true, eCaseMatters))
       accessible = new XULAlertAccessible(aContent, aDoc);
     else
-      accessible = new RoleTAccessible<roles::PANE>(aContent, aDoc);
+      accessible = new EnumRoleAccessible<roles::PANE>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:progressmeter")) {
     accessible = new XULProgressMeterAccessible(aContent, aDoc);
@@ -1341,7 +1341,7 @@ nsAccessibilityService::CreateAccessibleByType(nsIContent* aContent,
     accessible = new XULLabelAccessible(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:textbox")) {
-    accessible = new RoleTAccessible<roles::SECTION>(aContent, aDoc);
+    accessible = new EnumRoleAccessible<roles::SECTION>(aContent, aDoc);
 
   } else if (role.EqualsLiteral("xul:thumb")) {
     accessible = new XULThumbAccessible(aContent, aDoc);
@@ -1567,7 +1567,7 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame,
       newAcc = new HTMLSelectListAccessible(aContent, document);
       break;
     case eHTMLMediaType:
-      newAcc = new RoleTAccessible<roles::GROUPING>(aContent, document);
+      newAcc = new EnumRoleAccessible<roles::GROUPING>(aContent, document);
       break;
     case eHTMLRadioButtonType:
       newAcc = new HTMLRadioButtonAccessible(aContent, document);
diff --git a/accessible/generic/BaseAccessibles.h b/accessible/generic/BaseAccessibles.h
index cf427438c240..5a96395fcfc9 100644
--- a/accessible/generic/BaseAccessibles.h
+++ b/accessible/generic/BaseAccessibles.h
@@ -94,10 +94,10 @@ protected:
  * A simple accessible that gets its enumerated role.
  */
 template<a11y::role R>
-class RoleTAccessible : public AccessibleWrap
+class EnumRoleAccessible : public AccessibleWrap
 {
 public:
-  RoleTAccessible(nsIContent* aContent, DocAccessible* aDoc) :
+  EnumRoleAccessible(nsIContent* aContent, DocAccessible* aDoc) :
     AccessibleWrap(aContent, aDoc) { }
 
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aPtr) MOZ_OVERRIDE
@@ -107,7 +107,7 @@ public:
   virtual a11y::role NativeRole() MOZ_OVERRIDE { return R; }
 
 protected:
-  virtual ~RoleTAccessible() { }
+  virtual ~EnumRoleAccessible() { }
 };