diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index 4a547f5b1516..a273db0d22f5 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -1248,16 +1248,6 @@ var Policies = {
     },
   },
 
-  MasterPassword: {
-    onAllWindowsRestored(manager, param) {
-      if (param) {
-        manager.disallowFeature("removeMasterPassword");
-      } else {
-        manager.disallowFeature("createMasterPassword");
-      }
-    },
-  },
-
   NetworkPrediction: {
     onBeforeAddons(manager, param) {
       setAndLockPref("network.dns.disablePrefetch", !param);
@@ -1439,6 +1429,16 @@ var Policies = {
     },
   },
 
+  PrimaryPassword: {
+    onAllWindowsRestored(manager, param) {
+      if (param) {
+        manager.disallowFeature("removeMasterPassword");
+      } else {
+        manager.disallowFeature("createMasterPassword");
+      }
+    },
+  },
+
   PromptForDownloadLocation: {
     onBeforeAddons(manager, param) {
       setAndLockPref("browser.download.useDownloadDir", !param);
diff --git a/browser/components/enterprisepolicies/content/aboutPolicies.js b/browser/components/enterprisepolicies/content/aboutPolicies.js
index 24fab8822a9a..d02f688850b0 100644
--- a/browser/components/enterprisepolicies/content/aboutPolicies.js
+++ b/browser/components/enterprisepolicies/content/aboutPolicies.js
@@ -290,6 +290,7 @@ function generateDocumentation() {
     Certificates: "CertificatesDescription",
     SanitizeOnShutdown: "SanitizeOnShutdown2",
     Permissions: "Permissions2",
+    PrimaryPassword: "MasterPassword",
   };
 
   for (let policyName in schema.properties) {
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
index 3fd7541b7fe5..80e389e56755 100644
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -645,10 +645,6 @@
       }
     },
 
-    "MasterPassword": {
-      "type": "boolean"
-    },
-
     "NetworkPrediction": {
       "type": "boolean"
     },
@@ -1029,6 +1025,10 @@
       }
     },
 
+    "PrimaryPassword": {
+      "type": "boolean"
+    },
+
     "PromptForDownloadLocation": {
       "type": "boolean"
     },
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword.js
index 28050382d984..3505215eea2b 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword.js
@@ -11,7 +11,7 @@ let { LoginTestUtils } = ChromeUtils.import(
 add_task(async function test_policy_masterpassword_set() {
   await setupPolicyEngineWithJson({
     policies: {
-      MasterPassword: true,
+      PrimaryPassword: true,
     },
   });
 
@@ -35,7 +35,7 @@ add_task(async function test_policy_masterpassword_set() {
 add_task(async function test_policy_nochangemp() {
   await setupPolicyEngineWithJson({
     policies: {
-      MasterPassword: true,
+      PrimaryPassword: true,
     },
   });
 
@@ -73,7 +73,7 @@ add_task(async function test_policy_nochangemp() {
 add_task(async function test_policy_admin() {
   await setupPolicyEngineWithJson({
     policies: {
-      MasterPassword: true,
+      PrimaryPassword: true,
     },
   });
 
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_aboutlogins.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_aboutlogins.js
index 74b5dbc16d5a..60bd5fcfd962 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_aboutlogins.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_aboutlogins.js
@@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter(
 add_task(async function test_policy_admin() {
   await setupPolicyEngineWithJson({
     policies: {
-      MasterPassword: true,
+      PrimaryPassword: true,
     },
   });
 
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_doorhanger.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_doorhanger.js
index 1842779cde6c..96c8f7afd579 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_doorhanger.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_masterpassword_doorhanger.js
@@ -13,7 +13,7 @@ Services.scriptloader.loadSubScript(
 add_task(async function test_policy_masterpassword_doorhanger() {
   await setupPolicyEngineWithJson({
     policies: {
-      MasterPassword: true,
+      PrimaryPassword: true,
     },
   });