diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 20cae0f5e163..adeed7210cc0 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -1,3 +1,7 @@
+chrome/classic.jar
+chrome/classic.manifest
+chrome/reporter.jar
+chrome/reporter.manifest
 chrome/US.jar
 chrome/en-win.jar
 chrome/help.jar
diff --git a/browser/installer/unix/packages-static b/browser/installer/unix/packages-static
index 5f768d4a4df0..23ec819c82dd 100644
--- a/browser/installer/unix/packages-static
+++ b/browser/installer/unix/packages-static
@@ -265,8 +265,6 @@ bin/components/libmozgnome.so
 ; [Browser Chrome Files]
 bin/chrome/browser.jar
 bin/chrome/browser.manifest
-bin/chrome/classic.jar
-bin/chrome/classic.manifest
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
@@ -277,8 +275,6 @@ bin/chrome/toolkit.manifest
 bin/chrome/icons/default/default16.png
 bin/chrome/icons/default/default32.png
 bin/chrome/icons/default/default48.png
-bin/chrome/reporter.manifest
-bin/chrome/reporter.jar
 bin/@PREF_DIR@/reporter.js
 
 ; shell icons
diff --git a/browser/installer/windows/packages-static b/browser/installer/windows/packages-static
index d8822cb39e08..87b043712ebe 100644
--- a/browser/installer/windows/packages-static
+++ b/browser/installer/windows/packages-static
@@ -274,8 +274,6 @@ bin\components\url-classifier.xpt
 ; [Browser Chrome Files]
 bin\chrome\browser.jar
 bin\chrome\browser.manifest
-bin\chrome\classic.jar
-bin\chrome\classic.manifest
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\icon.png
 bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\preview.png
@@ -283,8 +281,6 @@ bin\chrome\comm.jar
 bin\chrome\comm.manifest
 bin\chrome\toolkit.jar
 bin\chrome\toolkit.manifest
-bin\chrome\reporter.manifest
-bin\chrome\reporter.jar
 bin\defaults\pref\reporter.js
 
 ; [Default Preferences]
diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn
index 8a1930e47fea..ba704b54c4c7 100644
--- a/browser/themes/gnomestripe/browser/jar.mn
+++ b/browser/themes/gnomestripe/browser/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
 % override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu
   skin/classic/browser/sanitizeDialog.css             (sanitizeDialog.css)
diff --git a/browser/themes/gnomestripe/communicator/jar.mn b/browser/themes/gnomestripe/communicator/jar.mn
index ac8a7eace29a..cdecb37eca40 100644
--- a/browser/themes/gnomestripe/communicator/jar.mn
+++ b/browser/themes/gnomestripe/communicator/jar.mn
@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index ae0947d32d5d..bf4082405cbf 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/
   skin/classic/browser/sanitizeDialog.css                   (sanitizeDialog.css)
 * skin/classic/browser/aboutPrivateBrowsing.css             (aboutPrivateBrowsing.css)
diff --git a/browser/themes/pinstripe/communicator/jar.mn b/browser/themes/pinstripe/communicator/jar.mn
index ac8a7eace29a..cdecb37eca40 100644
--- a/browser/themes/pinstripe/communicator/jar.mn
+++ b/browser/themes/pinstripe/communicator/jar.mn
@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index 3ad278815682..880cfbee2feb 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/browser/ os=WINNT osversion<6
 % skin browser classic/1.0 %skin/classic/browser/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -92,7 +92,7 @@ classic.jar:
         skin/classic/browser/tabbrowser/tabstrip-bottom.png                     (tabbrowser/tabstrip-bottom.png)
 
 #ifdef XP_WIN
-classic.jar:
+browser.jar:
 % skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6
         skin/classic/aero/browser/sanitizeDialog.css                       (sanitizeDialog.css)
 *       skin/classic/aero/browser/aboutPrivateBrowsing.css           (aboutPrivateBrowsing.css)
diff --git a/browser/themes/winstripe/communicator/jar.mn b/browser/themes/winstripe/communicator/jar.mn
index ac8a7eace29a..cdecb37eca40 100644
--- a/browser/themes/winstripe/communicator/jar.mn
+++ b/browser/themes/winstripe/communicator/jar.mn
@@ -1,3 +1,3 @@
-classic.jar:
+browser.jar:
 % skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css
diff --git a/caps/tests/mochitest/test_bug292789.html b/caps/tests/mochitest/test_bug292789.html
index 612aa00b3308..2cb1619a6b3a 100644
--- a/caps/tests/mochitest/test_bug292789.html
+++ b/caps/tests/mochitest/test_bug292789.html
@@ -55,7 +55,7 @@ function testScriptSrc(aCallback) {
 /** <img src=""> tests **/
 var img_global = "chrome://global/skin/icons/Error.png";
 var img_mozapps = "chrome://mozapps/skin/passwordmgr/key.png";
-var res_mozapps = "jar:resource://gre/chrome/classic.jar!/skin/classic/mozapps/passwordmgr/key.png";
+var res_mozapps = "jar:resource://gre/chrome/toolkit.jar!/skin/classic/mozapps/passwordmgr/key.png";
 
 var imgTests = [[img_global, "success"],
                 [img_mozapps, "fail"],
diff --git a/extensions/reporter/jar.mn b/extensions/reporter/jar.mn
index 2bfc32b5eb8d..71d1eaaf0be7 100644
--- a/extensions/reporter/jar.mn
+++ b/extensions/reporter/jar.mn
@@ -1,4 +1,4 @@
-reporter.jar:
+browser.jar:
 % content reporter %content/reporter/ xpcnativewrappers=yes
 % overlay chrome://browser/content/browser.xul         chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://navigator/content/navigator.xul     chrome://reporter/content/reporterOverlay.xul
diff --git a/toolkit/profile/skin/jar.mn b/toolkit/profile/skin/jar.mn
index 2fa34eb2c46f..2af27c99e455 100644
--- a/toolkit/profile/skin/jar.mn
+++ b/toolkit/profile/skin/jar.mn
@@ -1,3 +1,3 @@
-classic.jar:
+toolkit.jar:
   skin/classic/mozapps/profile/profileSelection.css
   skin/classic/mozapps/profile/profileicon.png
diff --git a/toolkit/themes/faststripe/global/jar.mn b/toolkit/themes/faststripe/global/jar.mn
index 8ca0902213de..fc51ef5ea158 100644
--- a/toolkit/themes/faststripe/global/jar.mn
+++ b/toolkit/themes/faststripe/global/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/
 # These are the CSS files that have been changed from winstripe
 +  skin/classic/global/button.css
diff --git a/toolkit/themes/gnomestripe/global/jar.mn b/toolkit/themes/gnomestripe/global/jar.mn
index 479344a03940..1fa1e0b8a5ae 100644
--- a/toolkit/themes/gnomestripe/global/jar.mn
+++ b/toolkit/themes/gnomestripe/global/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/global/autocomplete.css
 +  skin/classic/global/popup.css
 +  skin/classic/global/menu.css
diff --git a/toolkit/themes/gnomestripe/help/jar.mn b/toolkit/themes/gnomestripe/help/jar.mn
index b9495502516b..46c2cd4c3e19 100644
--- a/toolkit/themes/gnomestripe/help/jar.mn
+++ b/toolkit/themes/gnomestripe/help/jar.mn
@@ -1,2 +1,2 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/help/help.css
diff --git a/toolkit/themes/gnomestripe/mozapps/jar.mn b/toolkit/themes/gnomestripe/mozapps/jar.mn
index faaef19985b0..b1dfa5dd9280 100644
--- a/toolkit/themes/gnomestripe/mozapps/jar.mn
+++ b/toolkit/themes/gnomestripe/mozapps/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 + skin/classic/mozapps/update/update.png                   (update/update.png)
 + skin/classic/mozapps/update/updates.css                  (update/updates.css)
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn
index 07835145c74e..695f181ccd32 100644
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/
 +  skin/classic/global/10pct_transparent_grey.png
 +  skin/classic/global/20pct_transparent_pixel.png
diff --git a/toolkit/themes/pinstripe/help/jar.mn b/toolkit/themes/pinstripe/help/jar.mn
index e7e04f8d2c80..8ae79a8dfcc5 100644
--- a/toolkit/themes/pinstripe/help/jar.mn
+++ b/toolkit/themes/pinstripe/help/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
diff --git a/toolkit/themes/pinstripe/mozapps/jar.mn b/toolkit/themes/pinstripe/mozapps/jar.mn
index b72c0286fae9..3c8e67a1e836 100644
--- a/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/
   skin/classic/mozapps/downloads/buttons.png                      (downloads/buttons.png)
   skin/classic/mozapps/downloads/downloadIcon.png                 (downloads/downloadIcon.png)
diff --git a/toolkit/themes/pmstripe/global/jar.mn b/toolkit/themes/pmstripe/global/jar.mn
index de529e453e10..4b9d9246f465 100644
--- a/toolkit/themes/pmstripe/global/jar.mn
+++ b/toolkit/themes/pmstripe/global/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 +  skin/classic/global/popup.css
 +  skin/classic/global/menu.css
 +  skin/classic/global/toolbar.css
diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index faf3164d1c74..2a51f0754919 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/global/ os=WINNT osversion<6
 % skin global classic/1.0 %skin/classic/global/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -162,7 +162,7 @@ classic.jar:
         skin/classic/global/tree/twisty-open.png                 (tree/twisty-open.png)
 
 #ifdef XP_WIN
-classic.jar:
+toolkit.jar:
 % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6
         skin/classic/aero/global/about.css
         skin/classic/aero/global/appPicker.css
diff --git a/toolkit/themes/winstripe/help/jar.mn b/toolkit/themes/winstripe/help/jar.mn
index a60ab3d7aa6d..50ffdb520588 100644
--- a/toolkit/themes/winstripe/help/jar.mn
+++ b/toolkit/themes/winstripe/help/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
diff --git a/toolkit/themes/winstripe/mozapps/jar.mn b/toolkit/themes/winstripe/mozapps/jar.mn
index c58895d3b742..1b52176d15ab 100644
--- a/toolkit/themes/winstripe/mozapps/jar.mn
+++ b/toolkit/themes/winstripe/mozapps/jar.mn
@@ -1,4 +1,4 @@
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/mozapps/ os=WINNT osversion<6
 % skin mozapps classic/1.0 %skin/classic/mozapps/ os!=WINNT
 # NOTE: If you add a new file here, you'll need to add it to the aero
@@ -42,7 +42,7 @@ classic.jar:
         skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (xpinstall/xpinstallItemGeneric.png)
 
 #ifdef XP_WIN
-classic.jar:
+toolkit.jar:
 % skin mozapps classic/1.0 %skin/classic/aero/mozapps/ os=WINNT osversion>=6
         skin/classic/aero/mozapps/downloads/downloadButtons.png            (downloads/downloadButtons-aero.png)
         skin/classic/aero/mozapps/downloads/downloadIcon.png               (downloads/downloadIcon-aero.png)