--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -310,29 +310,29 @@
     skin/images/firebug/command-paintflashing.svg (themes/images/firebug/command-paintflashing.svg)
     skin/images/firebug/command-responsivemode.svg (themes/images/firebug/command-responsivemode.svg)
     skin/images/firebug/command-scratchpad.svg (themes/images/firebug/command-scratchpad.svg)
     skin/images/firebug/command-screenshot.svg (themes/images/firebug/command-screenshot.svg)
     skin/images/firebug/command-measure.svg (themes/images/firebug/command-measure.svg)
     skin/images/firebug/command-rulers.svg (themes/images/firebug/command-rulers.svg)
     skin/images/firebug/command-noautohide.svg (themes/images/firebug/command-noautohide.svg)
 
-%   skin webide classic/1.0 %skin/
-    skin/webide.css              (webide/themes/webide.css)
-    skin/icons.png               (webide/themes/icons.png)
-    skin/details.css             (webide/themes/details.css)
-    skin/newapp.css              (webide/themes/newapp.css)
-    skin/throbber.svg            (webide/themes/throbber.svg)
-    skin/deck.css                (webide/themes/deck.css)
-    skin/addons.css              (webide/themes/addons.css)
-    skin/runtimedetails.css      (webide/themes/runtimedetails.css)
-    skin/monitor.css             (webide/themes/monitor.css)
-    skin/config-view.css         (webide/themes/config-view.css)
-    skin/wifi-auth.css           (webide/themes/wifi-auth.css)
-    skin/logs.css                (webide/themes/logs.css)
-    skin/panel-listing.css       (webide/themes/panel-listing.css)
-    skin/simulator.css           (webide/themes/simulator.css)
-    skin/rocket.svg              (webide/themes/rocket.svg)
-    skin/noise.png               (webide/themes/noise.png)
-    skin/default-app-icon.png    (webide/themes/default-app-icon.png)
+%   skin webide classic/1.0 %webide-skin/
+    webide-skin/webide.css              (webide/themes/webide.css)
+    webide-skin/icons.png               (webide/themes/icons.png)
+    webide-skin/details.css             (webide/themes/details.css)
+    webide-skin/newapp.css              (webide/themes/newapp.css)
+    webide-skin/throbber.svg            (webide/themes/throbber.svg)
+    webide-skin/deck.css                (webide/themes/deck.css)
+    webide-skin/addons.css              (webide/themes/addons.css)
+    webide-skin/runtimedetails.css      (webide/themes/runtimedetails.css)
+    webide-skin/monitor.css             (webide/themes/monitor.css)
+    webide-skin/config-view.css         (webide/themes/config-view.css)
+    webide-skin/wifi-auth.css           (webide/themes/wifi-auth.css)
+    webide-skin/logs.css                (webide/themes/logs.css)
+    webide-skin/panel-listing.css       (webide/themes/panel-listing.css)
+    webide-skin/simulator.css           (webide/themes/simulator.css)
+    webide-skin/rocket.svg              (webide/themes/rocket.svg)
+    webide-skin/noise.png               (webide/themes/noise.png)
+    webide-skin/default-app-icon.png    (webide/themes/default-app-icon.png)
 
 % manifest devtools-startup.manifest
 % manifest webideComponents.manifest

--- a/devtools/client/webide/content/jar.mn
+++ b/devtools/client/webide/content/jar.mn
@@ -1,34 +1,34 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 [features/devtools@mozilla.org] chrome.jar:
-%   content webide %content/
-    content/webide.xul                (webide.xul)
-    content/webide.js                 (webide.js)
-    content/newapp.xul                (newapp.xul)
-    content/newapp.js                 (newapp.js)
-    content/details.xhtml             (details.xhtml)
-    content/details.js                (details.js)
-    content/addons.js                 (addons.js)
-    content/addons.xhtml              (addons.xhtml)
-    content/runtimedetails.js         (runtimedetails.js)
-    content/runtimedetails.xhtml      (runtimedetails.xhtml)
-    content/prefs.js                  (prefs.js)
-    content/prefs.xhtml               (prefs.xhtml)
-    content/monitor.xhtml             (monitor.xhtml)
-    content/monitor.js                (monitor.js)
-    content/devicepreferences.js      (devicepreferences.js)
-    content/devicepreferences.xhtml   (devicepreferences.xhtml)
-    content/wifi-auth.js              (wifi-auth.js)
-    content/wifi-auth.xhtml           (wifi-auth.xhtml)
-    content/logs.xhtml                (logs.xhtml)
-    content/logs.js                   (logs.js)
-    content/project-listing.xhtml     (project-listing.xhtml)
-    content/project-listing.js        (project-listing.js)
-    content/project-panel.js          (project-panel.js)
-    content/runtime-panel.js          (runtime-panel.js)
-    content/runtime-listing.xhtml     (runtime-listing.xhtml)
-    content/runtime-listing.js        (runtime-listing.js)
-    content/simulator.js              (simulator.js)
-    content/simulator.xhtml           (simulator.xhtml)
+%   content webide %webide-content/
+    webide-content/webide.xul                (webide.xul)
+    webide-content/webide.js                 (webide.js)
+    webide-content/newapp.xul                (newapp.xul)
+    webide-content/newapp.js                 (newapp.js)
+    webide-content/details.xhtml             (details.xhtml)
+    webide-content/details.js                (details.js)
+    webide-content/addons.js                 (addons.js)
+    webide-content/addons.xhtml              (addons.xhtml)
+    webide-content/runtimedetails.js         (runtimedetails.js)
+    webide-content/runtimedetails.xhtml      (runtimedetails.xhtml)
+    webide-content/prefs.js                  (prefs.js)
+    webide-content/prefs.xhtml               (prefs.xhtml)
+    webide-content/monitor.xhtml             (monitor.xhtml)
+    webide-content/monitor.js                (monitor.js)
+    webide-content/devicepreferences.js      (devicepreferences.js)
+    webide-content/devicepreferences.xhtml   (devicepreferences.xhtml)
+    webide-content/wifi-auth.js              (wifi-auth.js)
+    webide-content/wifi-auth.xhtml           (wifi-auth.xhtml)
+    webide-content/logs.xhtml                (logs.xhtml)
+    webide-content/logs.js                   (logs.js)
+    webide-content/project-listing.xhtml     (project-listing.xhtml)
+    webide-content/project-listing.js        (project-listing.js)
+    webide-content/project-panel.js          (project-panel.js)
+    webide-content/runtime-panel.js          (runtime-panel.js)
+    webide-content/runtime-listing.xhtml     (runtime-listing.xhtml)
+    webide-content/runtime-listing.js        (runtime-listing.js)
+    webide-content/simulator.js              (simulator.js)
+    webide-content/simulator.xhtml           (simulator.xhtml)