--- a/services/aitc/AitcComponents.manifest
+++ b/services/aitc/AitcComponents.manifest
@@ -2,9 +2,9 @@
 component {a3d387ca-fd26-44ca-93be-adb5fda5a78d} Aitc.js
 contract @mozilla.org/services/aitc;1 {a3d387ca-fd26-44ca-93be-adb5fda5a78d}
 category app-startup AitcService service,@mozilla.org/services/aitc;1
 
 component {1de7cbe8-60f1-493e-b56b-9d099b3c018e} Aitc.js
 contract @mozilla.org/network/protocol/about;1?what=apps {1de7cbe8-60f1-493e-b56b-9d099b3c018e}
 
 # Register resource aliases
-resource services-aitc resource:///modules/services-aitc/
+resource services-aitc resource://gre/modules/services-aitc/

--- a/services/common/bagheeraclient.js
+++ b/services/common/bagheeraclient.js
@@ -14,19 +14,19 @@
 this.EXPORTED_SYMBOLS = [
   "BagheeraClient",
   "BagheeraClientRequestResult",
 ];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/commonjs/promise/core.js");
-Cu.import("resource://gre/modules/services-common/log4moz.js");
-Cu.import("resource://gre/modules/services-common/rest.js");
-Cu.import("resource://gre/modules/services-common/utils.js");
+Cu.import("resource://services-common/log4moz.js");
+Cu.import("resource://services-common/rest.js");
+Cu.import("resource://services-common/utils.js");
 
 
 /**
  * Represents the result of a Bagheera request.
  */
 this.BagheeraClientRequestResult = function BagheeraClientRequestResult() {
   this.transportSuccess = false;
   this.serverSuccess = false;

--- a/services/common/modules-testing/bagheeraserver.js
+++ b/services/common/modules-testing/bagheeraserver.js
@@ -3,18 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 const {utils: Cu} = Components;
 
 this.EXPORTED_SYMBOLS = ["BagheeraServer"];
 
-Cu.import("resource://gre/modules/services-common/log4moz.js");
-Cu.import("resource://gre/modules/services-common/utils.js");
+Cu.import("resource://services-common/log4moz.js");
+Cu.import("resource://services-common/utils.js");
 Cu.import("resource://testing-common/httpd.js");
 
 
 /**
  * This is an implementation of the Bagheera server.
  *
  * The purpose of the server is to facilitate testing of the Bagheera
  * client and the Firefox Health report. It is *not* meant to be a

--- a/services/common/tests/unit/head_global.js
+++ b/services/common/tests/unit/head_global.js
@@ -41,14 +41,14 @@ registrar.registerFactory(Components.ID(
 
 function addResourceAlias() {
   Cu.import("resource://gre/modules/Services.jsm");
   const handler = Services.io.getProtocolHandler("resource")
                   .QueryInterface(Ci.nsIResProtocolHandler);
 
   let modules = ["aitc", "common", "crypto"];
   for each (let module in modules) {
-    let uri = Services.io.newURI("resource:///modules/services-" + module + "/",
+    let uri = Services.io.newURI("resource://gre/modules/services-" + module + "/",
                                  null, null);
     handler.setSubstitution("services-" + module, uri);
   }
 }
 addResourceAlias();

--- a/services/crypto/tests/unit/head_helpers.js
+++ b/services/crypto/tests/unit/head_helpers.js
@@ -50,17 +50,17 @@ registrar.registerFactory(Components.ID(
 
 }
 
 // Register resource alias. Normally done in SyncComponents.manifest.
 function addResourceAlias() {
   Cu.import("resource://gre/modules/Services.jsm");
   const resProt = Services.io.getProtocolHandler("resource")
                           .QueryInterface(Ci.nsIResProtocolHandler);
-  let uri = Services.io.newURI("resource:///modules/services-crypto/",
+  let uri = Services.io.newURI("resource://gre/modules/services-crypto/",
                                null, null);
   resProt.setSubstitution("services-crypto", uri);
 }
 addResourceAlias();
 
 /**
  * Print some debug message to the console. All arguments will be printed,
  * separated by spaces.

--- a/services/healthreport/policy.jsm
+++ b/services/healthreport/policy.jsm
@@ -7,18 +7,18 @@
 this.EXPORTED_SYMBOLS = [
   "DataSubmissionRequest", // For test use only.
   "HealthReportPolicy",
 ];
 
 const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
 
 Cu.import("resource://gre/modules/commonjs/promise/core.js");
-Cu.import("resource://gre/modules/services-common/log4moz.js");
-Cu.import("resource://gre/modules/services-common/utils.js");
+Cu.import("resource://services-common/log4moz.js");
+Cu.import("resource://services-common/utils.js");
 
 const MILLISECONDS_PER_DAY = 24 * 60 * 60 * 1000;
 
 // Used as a sanity lower bound for dates stored in prefs. This module was
 // implemented in 2012, so any earlier dates indicate an incorrect clock.
 const OLDEST_ALLOWED_YEAR = 2012;
 
 /**

--- a/services/notifications/NotificationsComponents.manifest
+++ b/services/notifications/NotificationsComponents.manifest
@@ -1,2 +1,2 @@
 # Register resource aliases
-resource services-notifications resource:///modules/services-notifications/
+resource services-notifications resource://gre/modules/services-notifications/

--- a/services/sync/SyncComponents.manifest
+++ b/services/sync/SyncComponents.manifest
@@ -14,12 +14,14 @@
 # sufficient to do it for the app-startup one, and the file is simpler that way.
 
 # Weave.js
 component {74b89fb0-f200-4ae8-a3ec-dd164117f6de} Weave.js
 contract @mozilla.org/weave/service;1 {74b89fb0-f200-4ae8-a3ec-dd164117f6de}
 category app-startup WeaveService service,@mozilla.org/weave/service;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} application={99bceaaa-e3c6-48c1-b981-ef9b46b67d60}
 component {d28f8a0b-95da-48f4-b712-caf37097be41} Weave.js
 contract @mozilla.org/network/protocol/about;1?what=sync-log {d28f8a0b-95da-48f4-b712-caf37097be41}
+
 # Register resource aliases
-resource services-sync resource:///modules/services-sync/
-resource services-common resource:///modules/services-common/
-resource services-crypto resource:///modules/services-crypto/
+# (Note, for tests these are also set up in addResourceAlias)
+resource services-sync resource://gre/modules/services-sync/
+resource services-common resource://gre/modules/services-common/
+resource services-crypto resource://gre/modules/services-crypto/

--- a/services/sync/tests/unit/head_appinfo.js
+++ b/services/sync/tests/unit/head_appinfo.js
@@ -49,14 +49,14 @@ registrar.registerFactory(Components.ID(
 
 
 // Register resource aliases. Normally done in SyncComponents.manifest.
 function addResourceAlias() {
   Cu.import("resource://gre/modules/Services.jsm");
   const resProt = Services.io.getProtocolHandler("resource")
                           .QueryInterface(Ci.nsIResProtocolHandler);
   for each (let s in ["common", "sync", "crypto"]) {
-    let uri = Services.io.newURI("resource:///modules/services-" + s + "/", null,
+    let uri = Services.io.newURI("resource://gre/modules/services-" + s + "/", null,
                                  null);
     resProt.setSubstitution("services-" + s, uri);
   }
 }
 addResourceAlias();

--- a/testing/marionette/marionette-actors.js
+++ b/testing/marionette/marionette-actors.js
@@ -32,17 +32,17 @@ specialpowers.specialPowersObserver.init
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");  
 
 Services.prefs.setBoolPref("marionette.contentListener", false);
 let appName = Services.appinfo.name;
 
 // import logger
-Cu.import("resource:///modules/services-common/log4moz.js");
+Cu.import("resource://gre/modules/services-common/log4moz.js");
 let logger = Log4Moz.repository.getLogger("Marionette");
 logger.info('marionette-actors.js loaded');
 
 // This is used to prevent newSession from returning before the telephony
 // API's are ready; see bug 792647.  This assumes that marionette-actors.js
 // will be loaded before the 'system-message-listener-ready' message
 // is fired.  If this stops being true, this approach will have to change.
 let systemMessageListenerReady = false;