diff --git a/.eslintignore b/.eslintignore
index 46307f605ad7..a2ed26c0d11c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -156,7 +156,7 @@ devtools/shared/webconsole/test/test_*.html
 
 # Ignore devtools preferences files
 devtools/client/preferences/**
-devtools/shim/devtools-startup-prefs.js
+devtools/startup/devtools-startup-prefs.js
 
 # Ignore devtools third-party libs
 devtools/shared/jsbeautify/*
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 368d0475ac34..169a72621a68 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -15,7 +15,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   LoginManagerContextMenu: "resource://gre/modules/LoginManagerContextMenu.jsm",
   WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
   ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.jsm",
-  DevToolsShim: "chrome://devtools-shim/content/DevToolsShim.jsm",
+  DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.jsm",
   NetUtil: "resource://gre/modules/NetUtil.jsm",
 });
 
diff --git a/browser/components/extensions/ext-devtools.js b/browser/components/extensions/ext-devtools.js
index 5ce93603d95d..f6ab2f86c1e4 100644
--- a/browser/components/extensions/ext-devtools.js
+++ b/browser/components/extensions/ext-devtools.js
@@ -14,7 +14,7 @@
  */
 
 ChromeUtils.defineModuleGetter(this, "DevToolsShim",
-                               "chrome://devtools-shim/content/DevToolsShim.jsm");
+                               "chrome://devtools-startup/content/DevToolsShim.jsm");
 
 ChromeUtils.import("resource://gre/modules/ExtensionParent.jsm");
 
diff --git a/browser/components/sessionstore/SessionStore.jsm b/browser/components/sessionstore/SessionStore.jsm
index 88de8a64f0fc..4fac0af751ba 100644
--- a/browser/components/sessionstore/SessionStore.jsm
+++ b/browser/components/sessionstore/SessionStore.jsm
@@ -165,7 +165,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {
 XPCOMUtils.defineLazyModuleGetters(this, {
   AppConstants: "resource://gre/modules/AppConstants.jsm",
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
-  DevToolsShim: "chrome://devtools-shim/content/DevToolsShim.jsm",
+  DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.jsm",
   GlobalState: "resource:///modules/sessionstore/GlobalState.jsm",
   PrivacyFilter: "resource:///modules/sessionstore/PrivacyFilter.jsm",
   PromiseUtils: "resource://gre/modules/PromiseUtils.jsm",
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 9777f9de5e23..c085f4cccff1 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -614,8 +614,8 @@
 @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
 
 ; [DevTools Shim Files]
-@RESPATH@/browser/chrome/devtools-shim@JAREXT@
-@RESPATH@/browser/chrome/devtools-shim.manifest
+@RESPATH@/browser/chrome/devtools-startup@JAREXT@
+@RESPATH@/browser/chrome/devtools-startup.manifest
 @RESPATH@/browser/@PREF_DIR@/devtools-startup-prefs.js
 
 ; DevTools
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 86341b2224a6..081259e5e8a1 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -83,7 +83,7 @@ ifneq '$(or $(MOZ_DEV_EDITION),$(NIGHTLY_BUILD))' ''
 	@$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
-	@$(MAKE) -C ../../devtools/shim/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
+	@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
 	@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
@@ -104,7 +104,7 @@ ifndef RELEASE_OR_BETA
 	@$(MAKE) -C ../extensions/presentation/locale chrome AB_CD=$*
 endif
 	@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
-	@$(MAKE) -C ../../devtools/shim/locales chrome AB_CD=$*
+	@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
 	@$(MAKE) chrome AB_CD=$*
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
 ifdef NIGHTLY_BUILD
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
index d1d252c31006..f7d8ae7baf82 100755
--- a/browser/locales/filter.py
+++ b/browser/locales/filter.py
@@ -6,7 +6,7 @@ def test(mod, path, entity = None):
   import re
   # ignore anything but Firefox
   if mod not in ("netwerk", "dom", "toolkit", "security/manager",
-                 "devtools/client", "devtools/shared", "devtools/shim",
+                 "devtools/client", "devtools/shared", "devtools/startup",
                  "browser",
                  "browser/extensions/formautofill",
                  "browser/extensions/onboarding",
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
index be3015e80997..b8169b5be03b 100644
--- a/browser/locales/l10n.ini
+++ b/browser/locales/l10n.ini
@@ -11,7 +11,7 @@ dirs = browser
      other-licenses/branding/firefox
      browser/branding/official
      devtools/client
-     devtools/shim
+     devtools/startup
      browser/extensions/formautofill
      browser/extensions/onboarding
      browser/extensions/webcompat-reporter
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
index 1d57a1b7638f..982661d2924c 100644
--- a/browser/locales/l10n.toml
+++ b/browser/locales/l10n.toml
@@ -145,8 +145,8 @@ locales = [
     path = "devtools/client/locales/l10n.toml"
 
 [[paths]]
-    reference = "devtools/shim/locales/en-US/**"
-    l10n = "{l}devtools/shim/**"
+    reference = "devtools/startup/locales/en-US/**"
+    l10n = "{l}devtools/startup/**"
 
 # Filters
 # The filters below are evaluated one after the other, in the given order.
diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index fecadb77682b..ae1599c6e3aa 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -34,7 +34,7 @@ loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scrat
 const {MultiLocalizationHelper} = require("devtools/shared/l10n");
 const L10N = new MultiLocalizationHelper(
   "devtools/client/locales/startup.properties",
-  "devtools/shim/locales/key-shortcuts.properties"
+  "devtools/startup/locales/key-shortcuts.properties"
 );
 
 var Tools = {};
diff --git a/devtools/client/framework/devtools.js b/devtools/client/framework/devtools.js
index 82fa36043e56..6779fc85934a 100644
--- a/devtools/client/framework/devtools.js
+++ b/devtools/client/framework/devtools.js
@@ -7,7 +7,7 @@
 const {Cu} = require("chrome");
 const Services = require("Services");
 
-const {DevToolsShim} = require("chrome://devtools-shim/content/DevToolsShim.jsm");
+const {DevToolsShim} = require("chrome://devtools-startup/content/DevToolsShim.jsm");
 
 // Load gDevToolsBrowser toolbox lazily as they need gDevTools to be fully initialized
 loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true);
diff --git a/devtools/client/netmonitor/webpack.config.js b/devtools/client/netmonitor/webpack.config.js
index 41ae4dc1a55e..49f3922db90b 100644
--- a/devtools/client/netmonitor/webpack.config.js
+++ b/devtools/client/netmonitor/webpack.config.js
@@ -92,7 +92,7 @@ let webpackConfig = {
       // Locales need to be explicitly mapped to the en-US subfolder
       "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
       "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
-      "devtools/shim/locales": path.join(__dirname, "../../shared/locales/en-US"),
+      "devtools/startup/locales": path.join(__dirname, "../../shared/locales/en-US"),
       "toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
 
       // Unless a path explicitly needs to be rewritten or shimmed, all devtools paths can
diff --git a/devtools/client/webconsole/webpack.config.js b/devtools/client/webconsole/webpack.config.js
index 3c5f909c6229..c059e33086bc 100644
--- a/devtools/client/webconsole/webpack.config.js
+++ b/devtools/client/webconsole/webpack.config.js
@@ -106,7 +106,7 @@ webpackConfig.resolve = {
     "toolkit/locales": path.join(__dirname, "../../../toolkit/locales/en-US"),
     "devtools/client/locales": path.join(__dirname, "../../client/locales/en-US"),
     "devtools/shared/locales": path.join(__dirname, "../../shared/locales/en-US"),
-    "devtools/shim/locales": path.join(__dirname, "../../shared/locales/en-US"),
+    "devtools/startup/locales": path.join(__dirname, "../../shared/locales/en-US"),
 
     // Unless a path explicitly needs to be rewritten or shimmed, all devtools paths can
     // be mapped to ../../
diff --git a/devtools/docs/preferences.md b/devtools/docs/preferences.md
index 680f0dd84dd4..2c580b303432 100644
--- a/devtools/docs/preferences.md
+++ b/devtools/docs/preferences.md
@@ -72,12 +72,12 @@ To create a new preference, it should be assigned a default value. Default prefe
 defined in preferences files such as:
 - devtools/client/preferences/devtools.js
 - devtools/client/preferences/debugger.js
-- devtools/shim/devtools-startup-prefs.js
+- devtools/startup/devtools-startup-prefs.js
 
 Most new preferences should go in devtools/client/preferences/devtools.js. Debugger
 specific preferences should go in devtools/client/preferences/debugger.js. Finally if a
 preference needs to be available very early during the Firefox startup sequence, it should
-go in devtools/shim/devtools-startup-prefs.js.
+go in devtools/startup/devtools-startup-prefs.js.
 
 ### Projects using Launchpad
 
diff --git a/devtools/moz.build b/devtools/moz.build
index 6367a0eb7928..ec820f4b16fb 100644
--- a/devtools/moz.build
+++ b/devtools/moz.build
@@ -13,11 +13,11 @@ if CONFIG['MOZ_DEVTOOLS'] == 'all':
     ]
 
 # `addon` is a special build mode to strip everything except binary components
-# and shim modules that are going to stay in Firefox once DevTools ship as an
+# and startup modules that are going to stay in Firefox once DevTools ship as an
 # add-on.
 # `platform` contains all native components
 DIRS += [
-    'shim',
+    'startup',
     'platform',
 ]
 
diff --git a/devtools/shared/Loader.jsm b/devtools/shared/Loader.jsm
index e3c4f0e3b335..36513e31f0ac 100644
--- a/devtools/shared/Loader.jsm
+++ b/devtools/shared/Loader.jsm
@@ -47,7 +47,7 @@ BuiltinProvider.prototype = {
       // used in the source tree.
       "devtools/client/locales": "chrome://devtools/locale",
       "devtools/shared/locales": "chrome://devtools-shared/locale",
-      "devtools/shim/locales": "chrome://devtools-shim/locale",
+      "devtools/startup/locales": "chrome://devtools-startup/locale",
       "toolkit/locales": "chrome://global/locale",
     };
     // When creating a Loader invisible to the Debugger, we have to ensure
diff --git a/devtools/shared/l10n.js b/devtools/shared/l10n.js
index a0cfcc1bac76..cec47202771f 100644
--- a/devtools/shared/l10n.js
+++ b/devtools/shared/l10n.js
@@ -30,7 +30,7 @@ const reqShared = require.context("raw!devtools/shared/locales/",
                                   true, /^.*\.properties$/);
 const reqClient = require.context("raw!devtools/client/locales/",
                                   true, /^.*\.properties$/);
-const reqShim = require.context("raw!devtools/shim/locales/",
+const reqStartup = require.context("raw!devtools/startup/locales/",
                                   true, /^.*\.properties$/);
 const reqGlobal = require.context("raw!toolkit/locales/",
                                   true, /^.*\.properties$/);
@@ -74,8 +74,8 @@ function getProperties(url) {
       reqFn = reqGlobal;
     } else if (/^devtools\/shared/.test(url)) {
       reqFn = reqShared;
-    } else if (/^devtools\/shim/.test(url)) {
-      reqFn = reqShim;
+    } else if (/^devtools\/startup/.test(url)) {
+      reqFn = reqStartup;
     } else {
       reqFn = reqClient;
     }
diff --git a/devtools/shim/DevToolsShim.jsm b/devtools/startup/DevToolsShim.jsm
similarity index 100%
rename from devtools/shim/DevToolsShim.jsm
rename to devtools/startup/DevToolsShim.jsm
diff --git a/devtools/shim/aboutdebugging-registration.js b/devtools/startup/aboutdebugging-registration.js
similarity index 100%
rename from devtools/shim/aboutdebugging-registration.js
rename to devtools/startup/aboutdebugging-registration.js
diff --git a/devtools/shim/aboutdebugging.manifest b/devtools/startup/aboutdebugging.manifest
similarity index 100%
rename from devtools/shim/aboutdebugging.manifest
rename to devtools/startup/aboutdebugging.manifest
diff --git a/devtools/shim/aboutdevtools/aboutdevtools-registration.js b/devtools/startup/aboutdevtools/aboutdevtools-registration.js
similarity index 92%
rename from devtools/shim/aboutdevtools/aboutdevtools-registration.js
rename to devtools/startup/aboutdevtools/aboutdevtools-registration.js
index 371d300417aa..b8af8c7e1acf 100644
--- a/devtools/shim/aboutdevtools/aboutdevtools-registration.js
+++ b/devtools/startup/aboutdevtools/aboutdevtools-registration.js
@@ -14,7 +14,7 @@ const { nsIAboutModule } = Ci;
 function AboutDevtools() {}
 
 AboutDevtools.prototype = {
-  uri: Services.io.newURI("chrome://devtools-shim/content/aboutdevtools/aboutdevtools.xhtml"),
+  uri: Services.io.newURI("chrome://devtools-startup/content/aboutdevtools/aboutdevtools.xhtml"),
   classDescription: "about:devtools",
   classID: Components.ID("3a16d383-92bd-4c24-ac10-0e2bd66883ab"),
   contractID: "@mozilla.org/network/protocol/about;1?what=devtools",
diff --git a/devtools/shim/aboutdevtools/aboutdevtools.css b/devtools/startup/aboutdevtools/aboutdevtools.css
similarity index 100%
rename from devtools/shim/aboutdevtools/aboutdevtools.css
rename to devtools/startup/aboutdevtools/aboutdevtools.css
diff --git a/devtools/shim/aboutdevtools/aboutdevtools.js b/devtools/startup/aboutdevtools/aboutdevtools.js
similarity index 89%
rename from devtools/shim/aboutdevtools/aboutdevtools.js
rename to devtools/startup/aboutdevtools/aboutdevtools.js
index 7fd6a7d95b41..d74ce79d6dd4 100644
--- a/devtools/shim/aboutdevtools/aboutdevtools.js
+++ b/devtools/startup/aboutdevtools/aboutdevtools.js
@@ -28,10 +28,10 @@ const GA_PARAMETERS = [
   ["utm_medium", "onboarding"],
 ];
 
-const ABOUTDEVTOOLS_STRINGS = "chrome://devtools-shim/locale/aboutdevtools.properties";
+const ABOUTDEVTOOLS_STRINGS = "chrome://devtools-startup/locale/aboutdevtools.properties";
 const aboutDevtoolsBundle = Services.strings.createBundle(ABOUTDEVTOOLS_STRINGS);
 
-const KEY_SHORTCUTS_STRINGS = "chrome://devtools-shim/locale/key-shortcuts.properties";
+const KEY_SHORTCUTS_STRINGS = "chrome://devtools-startup/locale/key-shortcuts.properties";
 const keyShortcutsBundle = Services.strings.createBundle(KEY_SHORTCUTS_STRINGS);
 
 // URL constructor doesn't support about: scheme,
@@ -86,47 +86,47 @@ function updatePage() {
  */
 const features = [
   {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-inspector.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-inspector.svg",
     title: "features.inspector.title",
     desc: "features.inspector.desc",
     link: "https://developer.mozilla.org/docs/Tools/Page_Inspector",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-console.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-console.svg",
     title: "features.console.title",
     desc: "features.console.desc",
     link: "https://developer.mozilla.org/docs/Tools/Web_Console",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-debugger.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-debugger.svg",
     title: "features.debugger.title",
     desc: "features.debugger.desc",
     link: "https://developer.mozilla.org/docs/Tools/Debugger",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-network.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-network.svg",
     title: "features.network.title",
     desc: "features.network.desc",
     link: "https://developer.mozilla.org/docs/Tools/Network_Monitor",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-storage.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-storage.svg",
     title: "features.storage.title",
     desc: "features.storage.desc",
     link: "https://developer.mozilla.org/docs/Tools/Storage_Inspector",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-responsive.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-responsive.svg",
     title: "features.responsive.title",
     desc: "features.responsive.desc",
     link: "https://developer.mozilla.org/docs/Tools/Responsive_Design_Mode",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-visualediting.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-visualediting.svg",
     title: "features.visualediting.title",
     desc: "features.visualediting.desc",
     link: "https://developer.mozilla.org/docs/Tools/Style_Editor",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-performance.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-performance.svg",
     title: "features.performance.title",
     desc: "features.performance.desc",
     link: "https://developer.mozilla.org/docs/Tools/Performance",
   }, {
-    icon: "chrome://devtools-shim/content/aboutdevtools/images/feature-memory.svg",
+    icon: "chrome://devtools-startup/content/aboutdevtools/images/feature-memory.svg",
     title: "features.memory.title",
     desc: "features.memory.desc",
     link: "https://developer.mozilla.org/docs/Tools/Memory",
diff --git a/devtools/shim/aboutdevtools/aboutdevtools.manifest b/devtools/startup/aboutdevtools/aboutdevtools.manifest
similarity index 100%
rename from devtools/shim/aboutdevtools/aboutdevtools.manifest
rename to devtools/startup/aboutdevtools/aboutdevtools.manifest
diff --git a/devtools/shim/aboutdevtools/aboutdevtools.xhtml b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
similarity index 89%
rename from devtools/shim/aboutdevtools/aboutdevtools.xhtml
rename to devtools/startup/aboutdevtools/aboutdevtools.xhtml
index 50b725293e45..3672e2944700 100644
--- a/devtools/shim/aboutdevtools/aboutdevtools.xhtml
+++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
@@ -5,7 +5,7 @@
 <!DOCTYPE html [
 <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-<!ENTITY % aboutdevtoolsDTD SYSTEM "chrome://devtools-shim/locale/aboutdevtools.dtd"> %aboutdevtoolsDTD;
+<!ENTITY % aboutdevtoolsDTD SYSTEM "chrome://devtools-startup/locale/aboutdevtools.dtd"> %aboutdevtoolsDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;">
@@ -13,10 +13,10 @@
   <title>&aboutDevtools.headTitle;</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>a
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools-shim/content/aboutdevtools/aboutdevtools.css"  type="text/css"/>
-  <link rel="stylesheet" href="chrome://devtools-shim/content/aboutdevtools/subscribe.css"  type="text/css"/>
-  <script type="application/javascript" src="chrome://devtools-shim/content/aboutdevtools/aboutdevtools.js"></script>
-  <script type="application/javascript" src="chrome://devtools-shim/content/aboutdevtools/subscribe.js"></script>
+  <link rel="stylesheet" href="chrome://devtools-startup/content/aboutdevtools/aboutdevtools.css"  type="text/css"/>
+  <link rel="stylesheet" href="chrome://devtools-startup/content/aboutdevtools/subscribe.css"  type="text/css"/>
+  <script type="application/javascript" src="chrome://devtools-startup/content/aboutdevtools/aboutdevtools.js"></script>
+  <script type="application/javascript" src="chrome://devtools-startup/content/aboutdevtools/subscribe.js"></script>
 </head>
 <body>
   <div id="install-page" class="wrapper" hidden="true">
@@ -89,7 +89,7 @@
 
     <footer>
       <img class="dev-edition-logo"
-           src="chrome://devtools-shim/content/aboutdevtools/images/dev-edition-logo.svg"
+           src="chrome://devtools-startup/content/aboutdevtools/images/dev-edition-logo.svg"
            alt="Firefox Developer Edition logo"/>
       <div class="footer-message">
         <h1 class="footer-message-title">&aboutDevtools.footer.title;</h1>
diff --git a/devtools/shim/aboutdevtools/images/dev-edition-logo.svg b/devtools/startup/aboutdevtools/images/dev-edition-logo.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/dev-edition-logo.svg
rename to devtools/startup/aboutdevtools/images/dev-edition-logo.svg
diff --git a/devtools/shim/aboutdevtools/images/external-link.svg b/devtools/startup/aboutdevtools/images/external-link.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/external-link.svg
rename to devtools/startup/aboutdevtools/images/external-link.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-console.svg b/devtools/startup/aboutdevtools/images/feature-console.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-console.svg
rename to devtools/startup/aboutdevtools/images/feature-console.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-debugger.svg b/devtools/startup/aboutdevtools/images/feature-debugger.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-debugger.svg
rename to devtools/startup/aboutdevtools/images/feature-debugger.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-inspector.svg b/devtools/startup/aboutdevtools/images/feature-inspector.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-inspector.svg
rename to devtools/startup/aboutdevtools/images/feature-inspector.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-memory.svg b/devtools/startup/aboutdevtools/images/feature-memory.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-memory.svg
rename to devtools/startup/aboutdevtools/images/feature-memory.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-network.svg b/devtools/startup/aboutdevtools/images/feature-network.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-network.svg
rename to devtools/startup/aboutdevtools/images/feature-network.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-performance.svg b/devtools/startup/aboutdevtools/images/feature-performance.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-performance.svg
rename to devtools/startup/aboutdevtools/images/feature-performance.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-responsive.svg b/devtools/startup/aboutdevtools/images/feature-responsive.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-responsive.svg
rename to devtools/startup/aboutdevtools/images/feature-responsive.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-storage.svg b/devtools/startup/aboutdevtools/images/feature-storage.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-storage.svg
rename to devtools/startup/aboutdevtools/images/feature-storage.svg
diff --git a/devtools/shim/aboutdevtools/images/feature-visualediting.svg b/devtools/startup/aboutdevtools/images/feature-visualediting.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/feature-visualediting.svg
rename to devtools/startup/aboutdevtools/images/feature-visualediting.svg
diff --git a/devtools/shim/aboutdevtools/images/otter.svg b/devtools/startup/aboutdevtools/images/otter.svg
similarity index 100%
rename from devtools/shim/aboutdevtools/images/otter.svg
rename to devtools/startup/aboutdevtools/images/otter.svg
diff --git a/devtools/shim/aboutdevtools/moz.build b/devtools/startup/aboutdevtools/moz.build
similarity index 100%
rename from devtools/shim/aboutdevtools/moz.build
rename to devtools/startup/aboutdevtools/moz.build
diff --git a/devtools/shim/aboutdevtools/subscribe.css b/devtools/startup/aboutdevtools/subscribe.css
similarity index 100%
rename from devtools/shim/aboutdevtools/subscribe.css
rename to devtools/startup/aboutdevtools/subscribe.css
diff --git a/devtools/shim/aboutdevtools/subscribe.js b/devtools/startup/aboutdevtools/subscribe.js
similarity index 98%
rename from devtools/shim/aboutdevtools/subscribe.js
rename to devtools/startup/aboutdevtools/subscribe.js
index bc9696a4b4b7..d6dd98f1eebc 100644
--- a/devtools/shim/aboutdevtools/subscribe.js
+++ b/devtools/startup/aboutdevtools/subscribe.js
@@ -15,7 +15,7 @@ window.addEventListener("load", function() {
   // Timeout for the subscribe XHR.
   const REQUEST_TIMEOUT = 5000;
 
-  const ABOUTDEVTOOLS_STRINGS = "chrome://devtools-shim/locale/aboutdevtools.properties";
+  const ABOUTDEVTOOLS_STRINGS = "chrome://devtools-startup/locale/aboutdevtools.properties";
   const aboutDevtoolsBundle = Services.strings.createBundle(ABOUTDEVTOOLS_STRINGS);
 
   let emailInput = document.getElementById("email");
diff --git a/devtools/shim/aboutdevtools/test/.eslintrc.js b/devtools/startup/aboutdevtools/test/.eslintrc.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/.eslintrc.js
rename to devtools/startup/aboutdevtools/test/.eslintrc.js
diff --git a/devtools/shim/aboutdevtools/test/browser.ini b/devtools/startup/aboutdevtools/test/browser.ini
similarity index 100%
rename from devtools/shim/aboutdevtools/test/browser.ini
rename to devtools/startup/aboutdevtools/test/browser.ini
diff --git a/devtools/shim/aboutdevtools/test/browser_aboutdevtools_closes_page.js b/devtools/startup/aboutdevtools/test/browser_aboutdevtools_closes_page.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/browser_aboutdevtools_closes_page.js
rename to devtools/startup/aboutdevtools/test/browser_aboutdevtools_closes_page.js
diff --git a/devtools/shim/aboutdevtools/test/browser_aboutdevtools_enables_devtools.js b/devtools/startup/aboutdevtools/test/browser_aboutdevtools_enables_devtools.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/browser_aboutdevtools_enables_devtools.js
rename to devtools/startup/aboutdevtools/test/browser_aboutdevtools_enables_devtools.js
diff --git a/devtools/shim/aboutdevtools/test/browser_aboutdevtools_focus_owner_tab.js b/devtools/startup/aboutdevtools/test/browser_aboutdevtools_focus_owner_tab.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/browser_aboutdevtools_focus_owner_tab.js
rename to devtools/startup/aboutdevtools/test/browser_aboutdevtools_focus_owner_tab.js
diff --git a/devtools/shim/aboutdevtools/test/browser_aboutdevtools_reuse_existing.js b/devtools/startup/aboutdevtools/test/browser_aboutdevtools_reuse_existing.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/browser_aboutdevtools_reuse_existing.js
rename to devtools/startup/aboutdevtools/test/browser_aboutdevtools_reuse_existing.js
diff --git a/devtools/shim/aboutdevtools/test/head.js b/devtools/startup/aboutdevtools/test/head.js
similarity index 100%
rename from devtools/shim/aboutdevtools/test/head.js
rename to devtools/startup/aboutdevtools/test/head.js
diff --git a/devtools/shim/aboutdevtoolstoolbox-registration.js b/devtools/startup/aboutdevtoolstoolbox-registration.js
similarity index 100%
rename from devtools/shim/aboutdevtoolstoolbox-registration.js
rename to devtools/startup/aboutdevtoolstoolbox-registration.js
diff --git a/devtools/shim/aboutdevtoolstoolbox.manifest b/devtools/startup/aboutdevtoolstoolbox.manifest
similarity index 100%
rename from devtools/shim/aboutdevtoolstoolbox.manifest
rename to devtools/startup/aboutdevtoolstoolbox.manifest
diff --git a/devtools/shim/devtools-startup-prefs.js b/devtools/startup/devtools-startup-prefs.js
similarity index 100%
rename from devtools/shim/devtools-startup-prefs.js
rename to devtools/startup/devtools-startup-prefs.js
diff --git a/devtools/shim/devtools-startup.js b/devtools/startup/devtools-startup.js
similarity index 99%
rename from devtools/shim/devtools-startup.js
rename to devtools/startup/devtools-startup.js
index 871541f9a670..0f95120befae 100644
--- a/devtools/shim/devtools-startup.js
+++ b/devtools/startup/devtools-startup.js
@@ -45,12 +45,12 @@ ChromeUtils.defineModuleGetter(this, "CustomizableWidgets",
                                "resource:///modules/CustomizableWidgets.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "StartupBundle", function() {
-  const url = "chrome://devtools-shim/locale/startup.properties";
+  const url = "chrome://devtools-startup/locale/startup.properties";
   return Services.strings.createBundle(url);
 });
 
 XPCOMUtils.defineLazyGetter(this, "KeyShortcutsBundle", function() {
-  const url = "chrome://devtools-shim/locale/key-shortcuts.properties";
+  const url = "chrome://devtools-startup/locale/key-shortcuts.properties";
   return Services.strings.createBundle(url);
 });
 
diff --git a/devtools/shim/devtools-startup.manifest b/devtools/startup/devtools-startup.manifest
similarity index 100%
rename from devtools/shim/devtools-startup.manifest
rename to devtools/startup/devtools-startup.manifest
diff --git a/devtools/shim/jar.mn b/devtools/startup/jar.mn
similarity index 96%
rename from devtools/shim/jar.mn
rename to devtools/startup/jar.mn
index e44d5ed6c4bb..1e14a4348176 100644
--- a/devtools/shim/jar.mn
+++ b/devtools/startup/jar.mn
@@ -2,8 +2,8 @@
 # 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/.
 
-devtools-shim.jar:
-%   content devtools-shim %content/
+devtools-startup.jar:
+%   content devtools-startup %content/
     content/aboutdevtools/aboutdevtools.xhtml  (aboutdevtools/aboutdevtools.xhtml)
     content/aboutdevtools/aboutdevtools.css (aboutdevtools/aboutdevtools.css)
     content/aboutdevtools/aboutdevtools.js (aboutdevtools/aboutdevtools.js)
diff --git a/devtools/shim/locales/en-US/aboutdevtools.dtd b/devtools/startup/locales/en-US/aboutdevtools.dtd
similarity index 100%
rename from devtools/shim/locales/en-US/aboutdevtools.dtd
rename to devtools/startup/locales/en-US/aboutdevtools.dtd
diff --git a/devtools/shim/locales/en-US/aboutdevtools.properties b/devtools/startup/locales/en-US/aboutdevtools.properties
similarity index 100%
rename from devtools/shim/locales/en-US/aboutdevtools.properties
rename to devtools/startup/locales/en-US/aboutdevtools.properties
diff --git a/devtools/shim/locales/en-US/key-shortcuts.properties b/devtools/startup/locales/en-US/key-shortcuts.properties
similarity index 100%
rename from devtools/shim/locales/en-US/key-shortcuts.properties
rename to devtools/startup/locales/en-US/key-shortcuts.properties
diff --git a/devtools/shim/locales/en-US/startup.properties b/devtools/startup/locales/en-US/startup.properties
similarity index 100%
rename from devtools/shim/locales/en-US/startup.properties
rename to devtools/startup/locales/en-US/startup.properties
diff --git a/devtools/shim/locales/jar.mn b/devtools/startup/locales/jar.mn
similarity index 67%
rename from devtools/shim/locales/jar.mn
rename to devtools/startup/locales/jar.mn
index 1f332a4b84b2..12fd3cdf7571 100644
--- a/devtools/shim/locales/jar.mn
+++ b/devtools/startup/locales/jar.mn
@@ -4,5 +4,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 @AB_CD@.jar:
-%   locale devtools-shim @AB_CD@ %locale/@AB_CD@/devtools/shim/
-    locale/@AB_CD@/devtools/shim/ (%*)
+%   locale devtools-startup @AB_CD@ %locale/@AB_CD@/devtools/startup/
+    locale/@AB_CD@/devtools/startup/ (%*)
diff --git a/devtools/shim/locales/moz.build b/devtools/startup/locales/moz.build
similarity index 100%
rename from devtools/shim/locales/moz.build
rename to devtools/startup/locales/moz.build
diff --git a/devtools/shim/moz.build b/devtools/startup/moz.build
similarity index 100%
rename from devtools/shim/moz.build
rename to devtools/startup/moz.build
diff --git a/devtools/shim/tests/browser/.eslintrc.js b/devtools/startup/tests/browser/.eslintrc.js
similarity index 100%
rename from devtools/shim/tests/browser/.eslintrc.js
rename to devtools/startup/tests/browser/.eslintrc.js
diff --git a/devtools/shim/tests/browser/browser.ini b/devtools/startup/tests/browser/browser.ini
similarity index 100%
rename from devtools/shim/tests/browser/browser.ini
rename to devtools/startup/tests/browser/browser.ini
diff --git a/devtools/shim/tests/browser/browser_shim_disable_devtools.js b/devtools/startup/tests/browser/browser_shim_disable_devtools.js
similarity index 100%
rename from devtools/shim/tests/browser/browser_shim_disable_devtools.js
rename to devtools/startup/tests/browser/browser_shim_disable_devtools.js
diff --git a/devtools/shim/tests/unit/.eslintrc.js b/devtools/startup/tests/unit/.eslintrc.js
similarity index 100%
rename from devtools/shim/tests/unit/.eslintrc.js
rename to devtools/startup/tests/unit/.eslintrc.js
diff --git a/devtools/shim/tests/unit/test_devtools_shim.js b/devtools/startup/tests/unit/test_devtools_shim.js
similarity index 98%
rename from devtools/shim/tests/unit/test_devtools_shim.js
rename to devtools/startup/tests/unit/test_devtools_shim.js
index 135760228668..a1db0dfc362e 100644
--- a/devtools/shim/tests/unit/test_devtools_shim.js
+++ b/devtools/startup/tests/unit/test_devtools_shim.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const { DevToolsShim } =
-    ChromeUtils.import("chrome://devtools-shim/content/DevToolsShim.jsm", {});
+    ChromeUtils.import("chrome://devtools-startup/content/DevToolsShim.jsm", {});
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 
 // Test the DevToolsShim
diff --git a/devtools/shim/tests/unit/xpcshell.ini b/devtools/startup/tests/unit/xpcshell.ini
similarity index 100%
rename from devtools/shim/tests/unit/xpcshell.ini
rename to devtools/startup/tests/unit/xpcshell.ini
diff --git a/toolkit/components/extensions/ext-runtime.js b/toolkit/components/extensions/ext-runtime.js
index b07acff617d4..ce119b8c529e 100644
--- a/toolkit/components/extensions/ext-runtime.js
+++ b/toolkit/components/extensions/ext-runtime.js
@@ -12,7 +12,7 @@ ChromeUtils.defineModuleGetter(this, "ExtensionParent",
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(this, "DevToolsShim",
-                               "chrome://devtools-shim/content/DevToolsShim.jsm");
+                               "chrome://devtools-startup/content/DevToolsShim.jsm");
 
 this.runtime = class extends ExtensionAPI {
   getAPI(context) {