--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -779,18 +779,18 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/chrome/icons/
 @RESPATH@/chrome/chrome@JAREXT@
 @RESPATH@/chrome/chrome.manifest
 @RESPATH@/components/B2GComponents.manifest
 @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@
 #if defined(ENABLE_MARIONETTE) || !defined(MOZ_WIDGET_GONK)
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
-@RESPATH@/components/MarionetteComponents.manifest
-@RESPATH@/components/marionettecomponent.js
+@RESPATH@/components/marionette.manifest
+@RESPATH@/components/marionette.js
 #endif
 @RESPATH@/components/AlertsService.js
 @RESPATH@/components/ContentPermissionPrompt.js
 #ifdef MOZ_UPDATER
 @RESPATH@/components/UpdatePrompt.js
 #endif
 @RESPATH@/components/DirectoryProvider.js
 @RESPATH@/components/ProcessGlobal.js

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -522,18 +522,18 @@
 
 #ifdef MOZ_WEBRTC
 @RESPATH@/components/PeerConnection.js
 @RESPATH@/components/PeerConnection.manifest
 #endif
 
 @RESPATH@/chrome/marionette@JAREXT@
 @RESPATH@/chrome/marionette.manifest
-@RESPATH@/components/MarionetteComponents.manifest
-@RESPATH@/components/marionettecomponent.js
+@RESPATH@/components/marionette.manifest
+@RESPATH@/components/marionette.js
 
 #ifdef MOZ_WEBSPEECH
 @RESPATH@/components/dom_webspeechsynth.xpt
 #endif
 
 @RESPATH@/components/nsAsyncShutdown.manifest
 @RESPATH@/components/nsAsyncShutdown.js
 

--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -538,18 +538,18 @@
 @BINPATH@/components/SiteSpecificUserAgent.js
 @BINPATH@/components/Snippets.js
 
 @BINPATH@/components/XPIDialogService.js
 
 #ifdef ENABLE_MARIONETTE
 @BINPATH@/chrome/marionette@JAREXT@
 @BINPATH@/chrome/marionette.manifest
-@BINPATH@/components/MarionetteComponents.manifest
-@BINPATH@/components/marionettecomponent.js
+@BINPATH@/components/marionette.manifest
+@BINPATH@/components/marionette.js
 #endif
 
 #ifdef PKG_LOCALE_MANIFEST
 #include @PKG_LOCALE_MANIFEST@
 #endif
 
 @BINPATH@/components/dom_audiochannel.xpt
 

deleted file mode 100644
--- a/testing/marionette/components/MarionetteComponents.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-# Marionette
-component {786a1369-dca5-4adc-8486-33d23c88010a} marionettecomponent.js
-contract @mozilla.org/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
-category command-line-handler b-marionette @mozilla.org/marionette;1
-category profile-after-change MarionetteComponent @mozilla.org/marionette;1

rename from testing/marionette/components/marionettecomponent.js
rename to testing/marionette/components/marionette.js

new file mode 100644
--- /dev/null
+++ b/testing/marionette/components/marionette.manifest
@@ -0,0 +1,4 @@
+component {786a1369-dca5-4adc-8486-33d23c88010a} marionette.js
+contract @mozilla.org/marionette;1 {786a1369-dca5-4adc-8486-33d23c88010a}
+category command-line-handler b-marionette @mozilla.org/marionette;1
+category profile-after-change Marionette @mozilla.org/marionette;1

--- a/testing/marionette/components/moz.build
+++ b/testing/marionette/components/moz.build
@@ -1,16 +1,9 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
 # 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/.
 
-EXTRA_COMPONENTS += [
-    'MarionetteComponents.manifest'
-]
+EXTRA_COMPONENTS += ["marionette.manifest"]
+EXTRA_PP_COMPONENTS += ["marionette.js"]
 
-EXTRA_PP_COMPONENTS += [
-    'marionettecomponent.js'
-]
-
-if CONFIG['ENABLE_MARIONETTE']:
-    DEFINES['ENABLE_MARIONETTE'] = 1
+if CONFIG["ENABLE_MARIONETTE"]:
+    DEFINES["ENABLE_MARIONETTE"] = 1