--- a/browser/base/content/test/general/contextmenu_common.js
+++ b/browser/base/content/test/general/contextmenu_common.js
@@ -317,18 +317,17 @@ async function test_contextmenu(selector
   if (menuItems) {
     if (Services.prefs.getBoolPref("devtools.inspector.enabled", true)) {
       let inspectItems = ["---", null,
                           "context-inspect", true];
       menuItems = menuItems.concat(inspectItems);
     }
 
     if (options.maybeScreenshotsPresent &&
-        !Services.prefs.getBoolPref("extensions.screenshots.disabled", false) &&
-        !Services.prefs.getBoolPref("extensions.screenshots.system-disabled", false)) {
+        !Services.prefs.getBoolPref("extensions.screenshots.disabled", false)) {
       let screenshotItems = [
         "---", null,
         "screenshots_mozilla_org_create-screenshot", true
       ];
 
       menuItems = menuItems.concat(screenshotItems);
     }
 

--- a/browser/components/uitour/test/browser_UITour_availableTargets.js
+++ b/browser/components/uitour/test/browser_UITour_availableTargets.js
@@ -149,15 +149,14 @@ var pageActionsHelper = {
       action.shownInUrlbar = originalState;
     }
     this._originalStates = null;
   }
 };
 
 function ensureScreenshotsEnabled() {
   SpecialPowers.pushPrefEnv({ set: [
-    [ "extensions.screenshots.disabled", false ],
-    [ "extensions.screenshots.system-disabled", false ]
+    [ "extensions.screenshots.disabled", false ]
   ]});
   return BrowserTestUtils.waitForCondition(() => {
     return PageActions.actionForID("screenshots");
   }, "Should enable Screenshots");
 }

--- a/browser/extensions/screenshots/test/browser/head.js
+++ b/browser/extensions/screenshots/test/browser/head.js
@@ -3,52 +3,52 @@
 // Currently Screenshots is disabled in tests.  We want these tests to work under
 // either case that Screenshots is disabled or enabled on startup of the browser,
 // and that at the end we're reset to the correct state.
 let enabledOnStartup = false;
 
 // ScreenshotsEnabled/Disabled promises return true if it was already
 // Enabled/Disabled, and false if it need to Enable/Disable.
 function promiseScreenshotsEnabled() {
-  if (!Services.prefs.getBoolPref("extensions.screenshots.system-disabled", false)) {
+  if (!Services.prefs.getBoolPref("extensions.screenshots.disabled", false)) {
     info("Screenshots was already enabled, assuming enabled by default for tests");
     enabledOnStartup = true;
     return Promise.resolve(true);
   }
   info("Screenshots is not enabled");
   return new Promise((resolve, reject) => {
     let interval = setInterval(() => {
       let action = PageActions.actionForID("screenshots");
       if (action) {
         info("screenshots page action created");
         clearInterval(interval);
         resolve(false);
       }
     }, 100);
     info("Set Screenshots disabled pref to false.");
-    Services.prefs.setBoolPref("extensions.screenshots.system-disabled", false);
+    Services.prefs.setBoolPref("extensions.screenshots.disabled", false);
   });
 }
 
 function promiseScreenshotsDisabled() {
-  if (Services.prefs.getBoolPref("extensions.screenshots.system-disabled", false)) {
+  if (Services.prefs.getBoolPref("extensions.screenshots.disabled", false)) {
     info("Screenshots already disabled");
     return Promise.resolve(true);
   }
   return new Promise((resolve, reject) => {
     let interval = setInterval(() => {
       let action = PageActions.actionForID("screenshots");
       if (!action) {
         info("screenshots page action removed");
         clearInterval(interval);
         resolve(false);
       }
     }, 100);
     info("Set Screenshots disabled pref to true.");
-    Services.prefs.setBoolPref("extensions.screenshots.system-disabled", true);
+    Services.prefs.setBoolPref("extensions.screenshots.disabled", true);
   });
 }
 
 function promiseScreenshotsReset() { // eslint-disable-line no-unused-vars
   if (enabledOnStartup) {
     info("Reset is enabling Screenshots addon");
     return promiseScreenshotsEnabled();
   }

--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -390,14 +390,14 @@ user_pref("signon.rememberSignons", fals
 user_pref("extensions.formautofill.available", "on");
 
 // Disable all recommended Marionette preferences for Gecko tests.
 // The prefs recommended by Marionette are typically geared towards
 // consumer automation; not vendor testing.
 user_pref("marionette.prefs.recommended", false);
 
 // Disable Screenshots by default for now
-user_pref("extensions.screenshots.system-disabled", true);
+user_pref("extensions.screenshots.disabled", true);
 
 // Set places maintenance far in the future to avoid it kicking in during tests.
 // The maintenance can take a relatively long time which may cause unnecessary
 // intermittents and slow down tests.
 user_pref("places.database.lastMaintenance", 7258114800);

--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -222,17 +222,16 @@ const DEFAULT_ENVIRONMENT_PREFS = new Ma
   ["extensions.formautofill.addresses.enabled", {what: RECORD_PREF_VALUE}],
   ["extensions.formautofill.creditCards.enabled", {what: RECORD_PREF_VALUE}],
   ["extensions.legacy.enabled", {what: RECORD_PREF_VALUE}],
   ["extensions.strictCompatibility", {what: RECORD_PREF_VALUE}],
   ["extensions.update.enabled", {what: RECORD_PREF_VALUE}],
   ["extensions.update.url", {what: RECORD_PREF_VALUE}],
   ["extensions.update.background.url", {what: RECORD_PREF_VALUE}],
   ["extensions.screenshots.disabled", {what: RECORD_PREF_VALUE}],
-  ["extensions.screenshots.system-disabled", {what: RECORD_PREF_VALUE}],
   ["general.smoothScroll", {what: RECORD_PREF_VALUE}],
   ["gfx.direct2d.disabled", {what: RECORD_PREF_VALUE}],
   ["gfx.direct2d.force-enabled", {what: RECORD_PREF_VALUE}],
   ["gfx.direct2d.use1_1", {what: RECORD_PREF_VALUE}],
   ["layers.acceleration.disabled", {what: RECORD_PREF_VALUE}],
   ["layers.acceleration.force-enabled", {what: RECORD_PREF_VALUE}],
   ["layers.async-pan-zoom.enabled", {what: RECORD_PREF_VALUE}],
   ["layers.async-video-oop.enabled", {what: RECORD_PREF_VALUE}],