--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -23,17 +23,17 @@ this.DevToolsUtils = devtools.require("d
 XPCOMUtils.defineLazyServiceGetter(
     this, "cookieManager", "@mozilla.org/cookiemanager;1", "nsICookieManager2");
 
 Cu.import("chrome://marionette/content/action.js");
 Cu.import("chrome://marionette/content/atom.js");
 Cu.import("chrome://marionette/content/interaction.js");
 Cu.import("chrome://marionette/content/element.js");
 Cu.import("chrome://marionette/content/event.js");
-Cu.import("chrome://marionette/content/frame-manager.js");
+Cu.import("chrome://marionette/content/frame.js");
 Cu.import("chrome://marionette/content/error.js");
 Cu.import("chrome://marionette/content/modal.js");
 Cu.import("chrome://marionette/content/proxy.js");
 Cu.import("chrome://marionette/content/simpletest.js");
 
 loader.loadSubScript("chrome://marionette/content/common.js");
 
 this.EXPORTED_SYMBOLS = ["GeckoDriver", "Context"];

rename from testing/marionette/frame-manager.js
rename to testing/marionette/frame.js

--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -8,17 +8,17 @@ marionette.jar:
   content/driver.js (driver.js)
   content/action.js (action.js)
   content/interaction.js (interaction.js)
   content/accessibility.js (accessibility.js)
   content/listener.js (listener.js)
   content/element.js (element.js)
   content/common.js (common.js)
   content/simpletest.js (simpletest.js)
-  content/frame-manager.js (frame-manager.js)
+  content/frame.js (frame.js)
   content/event.js  (event.js)
   content/error.js (error.js)
   content/message.js (message.js)
   content/dispatcher.js (dispatcher.js)
   content/emulator.js (emulator.js)
   content/modal.js (modal.js)
   content/proxy.js (proxy.js)
   content/capture.js (capture.js)