diff --git a/devtools/client/responsivedesign/responsivedesign-child.js b/devtools/client/responsive.html/browser/content.js
similarity index 100%
rename from devtools/client/responsivedesign/responsivedesign-child.js
rename to devtools/client/responsive.html/browser/content.js
diff --git a/devtools/client/responsive.html/browser/moz.build b/devtools/client/responsive.html/browser/moz.build
index f99bbc443d9e..6fb3888d963a 100644
--- a/devtools/client/responsive.html/browser/moz.build
+++ b/devtools/client/responsive.html/browser/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DevToolsModules(
+    'content.js',
     'swap.js',
     'tunnel.js',
     'web-navigation.js',
diff --git a/devtools/client/responsive.html/components/browser.js b/devtools/client/responsive.html/components/browser.js
index d529bbbf2fd7..c2a07baf6805 100644
--- a/devtools/client/responsive.html/components/browser.js
+++ b/devtools/client/responsive.html/components/browser.js
@@ -15,6 +15,8 @@ const { DOM: dom, createClass, addons, PropTypes } =
 const e10s = require("../utils/e10s");
 const message = require("../utils/message");
 
+const FRAME_SCRIPT = "resource://devtools/client/responsive.html/browser/content.js";
+
 module.exports = createClass({
 
   /**
@@ -83,8 +85,7 @@ module.exports = createClass({
     e10s.on(mm, "OnContentResize", onContentResize);
 
     let ready = e10s.once(mm, "ChildScriptReady");
-    mm.loadFrameScript("resource://devtools/client/responsivedesign/" +
-                       "responsivedesign-child.js", true);
+    mm.loadFrameScript(FRAME_SCRIPT, true);
     yield ready;
 
     let browserWindow = getToplevelWindow(window);
diff --git a/devtools/client/responsive.html/utils/e10s.js b/devtools/client/responsive.html/utils/e10s.js
index ace3466eb447..b8e6d94ed754 100644
--- a/devtools/client/responsive.html/utils/e10s.js
+++ b/devtools/client/responsive.html/utils/e10s.js
@@ -5,7 +5,7 @@
 "use strict";
 
 // The prefix used for RDM messages in content.
-// see: devtools/client/responsivedesign/responsivedesign-child.js
+// see: devtools/client/responsive.html/browser/content.js
 const MESSAGE_PREFIX = "ResponsiveMode:";
 const REQUEST_DONE_SUFFIX = ":Done";
 
diff --git a/devtools/client/responsivedesign/moz.build b/devtools/client/responsivedesign/moz.build
index 25c5c05fb91d..9585efed7670 100644
--- a/devtools/client/responsivedesign/moz.build
+++ b/devtools/client/responsivedesign/moz.build
@@ -6,10 +6,9 @@ BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 
 DevToolsModules(
     'resize-commands.js',
-    'responsivedesign-child.js',
     'responsivedesign-old.js',
     'responsivedesign.js',
 )
 
-with Files('**'):
-    BUG_COMPONENT = ('Firefox', 'Developer Tools: Responsive Design Mode')
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Developer Tools: Responsive Design Mode')
diff --git a/devtools/client/responsivedesign/responsivedesign-old.js b/devtools/client/responsivedesign/responsivedesign-old.js
index 16f7631b3006..414102ca10a2 100644
--- a/devtools/client/responsivedesign/responsivedesign-old.js
+++ b/devtools/client/responsivedesign/responsivedesign-old.js
@@ -209,7 +209,7 @@ ResponsiveUI.prototype = {
   init: Task.async(function* () {
     debug("INIT BEGINS");
     let ready = this.waitForMessage("ResponsiveMode:ChildScriptReady");
-    this.mm.loadFrameScript("resource://devtools/client/responsivedesign/responsivedesign-child.js", true);
+    this.mm.loadFrameScript("resource://devtools/client/responsive.html/browser/content.js", true);
     yield ready;
 
     yield gDevToolsBrowser.loadBrowserStyleSheet(this.mainWindow);