diff --git a/xpfe/global/jar.mn b/xpfe/global/jar.mn
index dce468f13fe2..9f22664ddd5b 100644
--- a/xpfe/global/jar.mn
+++ b/xpfe/global/jar.mn
@@ -54,7 +54,7 @@ toolkit.jar:
         content/global/bindings/scrollbox.xml       (resources/content/bindings/scrollbox.xml)
         content/global/bindings/splitter.xml        (resources/content/bindings/splitter.xml)
         content/global/bindings/stringbundle.xml    (resources/content/bindings/stringbundle.xml)
-        content/global/bindings/tabcontrol.xml      (resources/content/bindings/tabcontrol.xml)
+        content/global/bindings/tabbox.xml          (resources/content/bindings/tabbox.xml)
         content/global/bindings/text.xml            (resources/content/bindings/text.xml)
         content/global/bindings/textbox.xml         (resources/content/bindings/textbox.xml)
         content/global/bindings/titledbox.xml       (resources/content/bindings/titledbox.xml)
diff --git a/xpfe/global/resources/content/bindings/tabcontrol.xml b/xpfe/global/resources/content/bindings/tabbox.xml
similarity index 93%
rename from xpfe/global/resources/content/bindings/tabcontrol.xml
rename to xpfe/global/resources/content/bindings/tabbox.xml
index 6728e5fdf2d0..a2adf94b676d 100644
--- a/xpfe/global/resources/content/bindings/tabcontrol.xml
+++ b/xpfe/global/resources/content/bindings/tabbox.xml
@@ -6,12 +6,12 @@
 
   <binding id="tab-base">
     <resources>
-      <stylesheet src="chrome://global/skin/tabcontrol.css"/>
+      <stylesheet src="chrome://global/skin/tabbox.css"/>
     </resources>
   </binding>
 
-  <binding id="tabcontrol" display="xul:box"
-           extends="chrome://global/content/bindings/tabcontrol.xml#tab-base">
+  <binding id="tabbox" display="xul:box"
+           extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <content orient="vertical"/>
 
     <implementation>
@@ -68,7 +68,7 @@
   </binding>
 
   <binding id="tabs" display="xul:box"
-           extends="chrome://global/content/bindings/tabcontrol.xml#tab-base">
+           extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <implementation>
       <constructor>
       <![CDATA[
@@ -145,7 +145,7 @@
   </binding>
   
   <binding id="tabpanels" display="xul:deck"
-           extends="chrome://global/content/bindings/tabcontrol.xml#tab-base">
+           extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <implementation>
       <!-- should be defined on deck! -->
       <property name="index"
@@ -155,7 +155,7 @@
   </binding>
 
   <binding id="tab" display="xul:button"
-           extends="chrome://global/content/bindings/tabcontrol.xml#tab-base">
+           extends="chrome://global/content/bindings/tabbox.xml#tab-base">
     <content>
       <xul:box class="tab-box" flex="1" autostretch="never" orient="horizontal">
         <xul:image class="tab-image" inherits="src"/>
@@ -202,7 +202,7 @@
           if (tabs.localName == "tabs")
             break;
           tabs = tabs.parentNode;
-        } while(tabs.localName != "tabcontrol");
+        } while(tabs.localName != "tabbox");
         tabs.selectedTab = this;
         if (!this.selected) this.selected = true;
       ]]>
diff --git a/xpfe/global/resources/content/xul.css b/xpfe/global/resources/content/xul.css
index d17f452ea1d1..6f74b683023d 100644
--- a/xpfe/global/resources/content/xul.css
+++ b/xpfe/global/resources/content/xul.css
@@ -435,22 +435,22 @@ stack {
    visibility: hidden;
 }
 
-/********** tabcontrol *********/
+/********** tabbox *********/
 
-tabcontrol {
-  -moz-binding: url("chrome://global/content/bindings/tabcontrol.xml#tabcontrol");
+tabbox {
+  -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabbox");
 }
 
 tabs {
-  -moz-binding: url("chrome://global/content/bindings/tabcontrol.xml#tabs");
+  -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabs");
 }
 
 tab {
-  -moz-binding: url("chrome://global/content/bindings/tabcontrol.xml#tab");
+  -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tab");
 }
 
 tabpanels {
-  -moz-binding: url("chrome://global/content/bindings/tabcontrol.xml#tabpanels");
+  -moz-binding: url("chrome://global/content/bindings/tabbox.xml#tabpanels");
   display: -moz-xul-deck;
 }