--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -21,17 +21,17 @@ var {devtools} = Cu.import("resource://d
 this.DevToolsUtils = devtools.require("devtools/shared/DevToolsUtils");
 
 XPCOMUtils.defineLazyServiceGetter(
     this, "cookieManager", "@mozilla.org/cookiemanager;1", "nsICookieManager2");
 
 Cu.import("chrome://marionette/content/actions.js");
 Cu.import("chrome://marionette/content/atom.js");
 Cu.import("chrome://marionette/content/interactions.js");
-Cu.import("chrome://marionette/content/elements.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/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");

rename from testing/marionette/elements.js
rename to testing/marionette/element.js

--- a/testing/marionette/event.js
+++ b/testing/marionette/event.js
@@ -6,17 +6,17 @@
 
 "use strict";
 
 const {interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/Log.jsm");
 const logger = Log.repository.getLogger("Marionette");
 
-Cu.import("chrome://marionette/content/elements.js");
+Cu.import("chrome://marionette/content/element.js");
 Cu.import("chrome://marionette/content/error.js");
 
 this.EXPORTED_SYMBOLS = ["event"];
 
 // must be synchronised with nsIDOMWindowUtils
 const COMPOSITION_ATTR_RAWINPUT = 0x02;
 const COMPOSITION_ATTR_SELECTEDRAWTEXT = 0x03;
 const COMPOSITION_ATTR_CONVERTEDTEXT = 0x04;

--- a/testing/marionette/interactions.js
+++ b/testing/marionette/interactions.js
@@ -4,17 +4,17 @@
 
 "use strict";
 
 const {utils: Cu} = Components;
 
 Cu.import("chrome://marionette/content/accessibility.js");
 Cu.import("chrome://marionette/content/atom.js");
 Cu.import("chrome://marionette/content/error.js");
-Cu.import("chrome://marionette/content/elements.js");
+Cu.import("chrome://marionette/content/element.js");
 Cu.import("chrome://marionette/content/event.js");
 
 this.EXPORTED_SYMBOLS = ["Interactions"];
 
 /**
  * XUL elements that support disabled attribtue.
  */
 const DISABLED_ATTRIBUTE_SUPPORTED_XUL = new Set([

--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -5,17 +5,17 @@
 marionette.jar:
 % content marionette %content/
   content/server.js (server.js)
   content/driver.js (driver.js)
   content/actions.js (actions.js)
   content/interactions.js (interactions.js)
   content/accessibility.js (accessibility.js)
   content/listener.js (listener.js)
-  content/elements.js (elements.js)
+  content/element.js (element.js)
   content/common.js (common.js)
   content/simpletest.js (simpletest.js)
   content/frame-manager.js (frame-manager.js)
   content/event.js  (event.js)
   content/ChromeUtils.js  (ChromeUtils.js)
   content/error.js (error.js)
   content/message.js (message.js)
   content/dispatcher.js (dispatcher.js)

--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -12,17 +12,17 @@ var loader = Cc["@mozilla.org/moz/jssubs
 
 loader.loadSubScript("chrome://marionette/content/simpletest.js");
 loader.loadSubScript("chrome://marionette/content/common.js");
 
 Cu.import("chrome://marionette/content/actions.js");
 Cu.import("chrome://marionette/content/atom.js");
 Cu.import("chrome://marionette/content/capture.js");
 Cu.import("chrome://marionette/content/cookies.js");
-Cu.import("chrome://marionette/content/elements.js");
+Cu.import("chrome://marionette/content/element.js");
 Cu.import("chrome://marionette/content/error.js");
 Cu.import("chrome://marionette/content/event.js");
 Cu.import("chrome://marionette/content/proxy.js");
 Cu.import("chrome://marionette/content/interactions.js");
 
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/Task.jsm");

--- a/testing/marionette/server.js
+++ b/testing/marionette/server.js
@@ -10,17 +10,17 @@ var loader = Cc["@mozilla.org/moz/jssubs
 const ServerSocket = CC("@mozilla.org/network/server-socket;1", "nsIServerSocket", "initSpecialConnection");
 
 Cu.import("resource://gre/modules/Log.jsm");
 Cu.import("resource://gre/modules/Preferences.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 Cu.import("chrome://marionette/content/dispatcher.js");
 Cu.import("chrome://marionette/content/driver.js");
-Cu.import("chrome://marionette/content/elements.js");
+Cu.import("chrome://marionette/content/element.js");
 Cu.import("chrome://marionette/content/simpletest.js");
 
 // Bug 1083711: Load transport.js as an SDK module instead of subscript
 loader.loadSubScript("resource://devtools/shared/transport/transport.js");
 
 // Preserve this import order:
 var events = {};
 loader.loadSubScript("chrome://marionette/content/ChromeUtils.js", events);