--- a/layout/tools/reftest/b2g_start_script.js
+++ b/layout/tools/reftest/b2g_start_script.js
@@ -1,21 +1,21 @@
 /* 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/. */
 
 const { utils: Cu, classes: Cc, interfaces: Ci } = Components;
 
 function setPermissions() {
-  if (__marionetteParams.length < 2) {
+  if (__webDriverArguments.length < 2) {
     return;
   }
 
-  let serverAddr = __marionetteParams[0];
-  let serverPort = __marionetteParams[1];
+  let serverAddr = __webDriverArguments[0];
+  let serverPort = __webDriverArguments[1];
   let perms = Cc["@mozilla.org/permissionmanager;1"]
               .getService(Ci.nsIPermissionManager);
   let ioService = Cc["@mozilla.org/network/io-service;1"]
                   .getService(Ci.nsIIOService);
   let uri = ioService.newURI("http://" + serverAddr + ":" + serverPort, null, null);
   perms.add(uri, "allowXULXBL", Ci.nsIPermissionManager.ALLOW_ACTION);
 }
 

--- a/testing/marionette/harness/marionette/atoms/b2g_update_test.js
+++ b/testing/marionette/harness/marionette/atoms/b2g_update_test.js
@@ -234,18 +234,18 @@ function runUpdateTest(stage) {
       if (postUpdate) {
         postUpdate();
       }
       break;
   }
 }
 
 var updateArgs;
-if (__marionetteParams) {
-  updateArgs = __marionetteParams[0];
+if (__webDriverArguments) {
+  updateArgs = __webDriverArguments[0];
 }
 
 function cleanUp() {
   cleanPrefs();
   finish();
   //marionetteScriptFinished();
 }
 

--- a/testing/mochitest/start_b2g.js
+++ b/testing/mochitest/start_b2g.js
@@ -1,17 +1,17 @@
 /* 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/. */
 
-var outOfProcess = __marionetteParams[0]
-var mochitestUrl = __marionetteParams[1]
-var onDevice = __marionetteParams[2]
-var wifiSettings = __marionetteParams[3]
-var chrome = __marionetteParams[4]
+var outOfProcess = __webDriverArguments[0]
+var mochitestUrl = __webDriverArguments[1]
+var onDevice = __webDriverArguments[2]
+var wifiSettings = __webDriverArguments[3]
+var chrome = __webDriverArguments[4]
 var prefs = Components.classes["@mozilla.org/preferences-service;1"].
                             getService(Components.interfaces.nsIPrefBranch)
 var settings = window.navigator.mozSettings;
 var cm = Components.classes["@mozilla.org/categorymanager;1"].
                     getService(Components.interfaces.nsICategoryManager);
 
 if (wifiSettings)
   wifiSettings = JSON.parse(wifiSettings);

--- a/testing/mochitest/start_desktop.js
+++ b/testing/mochitest/start_desktop.js
@@ -1,14 +1,14 @@
 /* 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/. */
 
-const flavor  = __marionetteParams[0]
-const url = __marionetteParams[1]
+const flavor  = __webDriverArguments[0]
+const url = __webDriverArguments[1]
 
 let wm = Cc["@mozilla.org/appshell/window-mediator;1"]
           .getService(Ci.nsIWindowMediator);
 let win = wm.getMostRecentWindow("navigator:browser");
 
 // mochikit's bootstrap.js has set up a listener for this event. It's
 // used so bootstrap.js knows which flavor and url to load.
 let ev = new CustomEvent('mochitest-load', {'detail': [flavor, url]});