--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1635,17 +1635,17 @@ pref("browser.crashReports.unsubmittedCh
 pref("browser.crashReports.unsubmittedCheck.autoSubmit", false);
 
 // Preferences for the form autofill system extension
 #ifdef NIGHTLY_BUILD
 pref("browser.formautofill.experimental", true);
 #else
 pref("browser.formautofill.experimental", false);
 #endif
-pref("browser.formautofill.enabled", true);
+pref("extensions.formautofill.addresses.enabled", true);
 pref("browser.formautofill.loglevel", "Warn");
 
 // Whether or not to restore a session with lazy-browser tabs.
 pref("browser.sessionstore.restore_tabs_lazily", true);
 
 // Enable safebrowsing v4 tables (suffixed by "-proto") update.
 #ifdef NIGHTLY_BUILD
 pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,goog-malware-proto,goog-unwanted-proto,test-malware-simple,test-unwanted-simple");

--- a/browser/extensions/formautofill/FormAutofillParent.jsm
+++ b/browser/extensions/formautofill/FormAutofillParent.jsm
@@ -42,17 +42,17 @@ Cu.import("resource://formautofill/FormA
 XPCOMUtils.defineLazyModuleGetter(this, "profileStorage",
                                   "resource://formautofill/ProfileStorage.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FormAutofillPreferences",
                                   "resource://formautofill/FormAutofillPreferences.jsm");
 
 this.log = null;
 FormAutofillUtils.defineLazyLogGetter(this, this.EXPORTED_SYMBOLS[0]);
 
-const ENABLED_PREF = "browser.formautofill.enabled";
+const ENABLED_PREF = "extensions.formautofill.addresses.enabled";
 
 function FormAutofillParent() {
 }
 
 FormAutofillParent.prototype = {
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]),
 
   /**

--- a/browser/extensions/formautofill/FormAutofillPreferences.jsm
+++ b/browser/extensions/formautofill/FormAutofillPreferences.jsm
@@ -6,17 +6,17 @@
  * Injects the form autofill section into about:preferences.
  */
 
 "use strict";
 
 this.EXPORTED_SYMBOLS = ["FormAutofillPreferences"];
 
 const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
-const PREF_AUTOFILL_ENABLED = "browser.formautofill.enabled";
+const PREF_AUTOFILL_ENABLED = "extensions.formautofill.addresses.enabled";
 const BUNDLE_URI = "chrome://formautofill/locale/formautofill.properties";
 const MANAGE_PROFILES_URL = "chrome://formautofill/content/manageProfiles.xhtml";
 const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://formautofill/FormAutofillUtils.jsm");
 

--- a/browser/extensions/formautofill/content/FormAutofillFrameScript.js
+++ b/browser/extensions/formautofill/content/FormAutofillFrameScript.js
@@ -28,34 +28,34 @@ var FormAutofillFrameScript = {
     addMessageListener("FormAutoComplete:PopupClosed", this);
   },
 
   handleEvent(evt) {
     if (!evt.isTrusted) {
       return;
     }
 
-    if (!Services.prefs.getBoolPref("browser.formautofill.enabled")) {
+    if (!Services.prefs.getBoolPref("extensions.formautofill.addresses.enabled")) {
       return;
     }
 
     switch (evt.type) {
       case "focusin": {
         let element = evt.target;
         if (!(element instanceof Ci.nsIDOMHTMLInputElement)) {
           return;
         }
         FormAutofillContent.identifyAutofillFields(element.ownerDocument);
         break;
       }
     }
   },
 
   receiveMessage(message) {
-    if (!Services.prefs.getBoolPref("browser.formautofill.enabled")) {
+    if (!Services.prefs.getBoolPref("extensions.formautofill.addresses.enabled")) {
       return;
     }
 
     switch (message.name) {
       case "FormAutofill:PreviewProfile":
       case "FormAutoComplete:PopupClosed":
         FormAutofillContent._previewProfile(content.document);
         break;

--- a/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
+++ b/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
@@ -1,15 +1,15 @@
 "use strict";
 
 const PAGE_PREFS = "about:preferences";
 const PAGE_PRIVACY = PAGE_PREFS + "#privacy";
 const GROUP_AUTOFILL = "#passwordsGroup";
 const CHECKBOX_AUTOFILL = "#profileAutofill checkbox";
-const PREF_AUTOFILL_ENABLED = "browser.formautofill.enabled";
+const PREF_AUTOFILL_ENABLED = "extensions.formautofill.addresses.enabled";
 const TEST_SELECTORS = {
   group: GROUP_AUTOFILL,
   checkbox: CHECKBOX_AUTOFILL,
 };
 
 // Visibility of form autofill group should be hidden when opening
 // preferences page.
 add_task(function* test_aboutPreferences() {

--- a/browser/extensions/formautofill/test/unit/test_enabledStatus.js
+++ b/browser/extensions/formautofill/test/unit/test_enabledStatus.js
@@ -26,22 +26,22 @@ add_task(function* test_enabledStatus_ob
   let formAutofillParent = new FormAutofillParent();
   sinon.stub(formAutofillParent, "_getStatus");
   sinon.spy(formAutofillParent, "_setStatus");
   sinon.stub(formAutofillParent, "_updateSavedFieldNames");
 
   // _enabled = _getStatus() => No need to trigger onStatusChanged
   formAutofillParent._enabled = true;
   formAutofillParent._getStatus.returns(true);
-  formAutofillParent.observe(null, "nsPref:changed", "browser.formautofill.enabled");
+  formAutofillParent.observe(null, "nsPref:changed", "extensions.formautofill.addresses.enabled");
   do_check_eq(formAutofillParent._setStatus.called, false);
 
   // _enabled != _getStatus() => Need to trigger onStatusChanged
   formAutofillParent._getStatus.returns(false);
-  formAutofillParent.observe(null, "nsPref:changed", "browser.formautofill.enabled");
+  formAutofillParent.observe(null, "nsPref:changed", "extensions.formautofill.addresses.enabled");
   do_check_eq(formAutofillParent._setStatus.called, true);
 
   // profile added => Need to trigger onStatusChanged
   formAutofillParent._getStatus.returns(!formAutofillParent._enabled);
   formAutofillParent._setStatus.reset();
   formAutofillParent.observe(null, "formautofill-storage-changed", "add");
   do_check_eq(formAutofillParent._setStatus.called, true);
 
@@ -56,37 +56,37 @@ add_task(function* test_enabledStatus_ob
   formAutofillParent._setStatus.reset();
   formAutofillParent.observe(null, "formautofill-storage-changed", "update");
   do_check_eq(formAutofillParent._setStatus.called, false);
 });
 
 add_task(function* test_enabledStatus_getStatus() {
   let formAutofillParent = new FormAutofillParent();
   do_register_cleanup(function cleanup() {
-    Services.prefs.clearUserPref("browser.formautofill.enabled");
+    Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
   });
 
   sinon.stub(profileStorage, "getAll");
   profileStorage.getAll.returns([]);
 
   // pref is enabled and profile is empty.
-  Services.prefs.setBoolPref("browser.formautofill.enabled", true);
+  Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", true);
   do_check_eq(formAutofillParent._getStatus(), false);
 
   // pref is disabled and profile is empty.
-  Services.prefs.setBoolPref("browser.formautofill.enabled", false);
+  Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", false);
   do_check_eq(formAutofillParent._getStatus(), false);
 
   profileStorage.getAll.returns(["test-profile"]);
   // pref is enabled and profile is not empty.
-  Services.prefs.setBoolPref("browser.formautofill.enabled", true);
+  Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", true);
   do_check_eq(formAutofillParent._getStatus(), true);
 
   // pref is disabled and profile is not empty.
-  Services.prefs.setBoolPref("browser.formautofill.enabled", false);
+  Services.prefs.setBoolPref("extensions.formautofill.addresses.enabled", false);
   do_check_eq(formAutofillParent._getStatus(), false);
 });
 
 add_task(function* test_enabledStatus_setStatus() {
   let formAutofillParent = new FormAutofillParent();
   sinon.spy(formAutofillParent, "_onStatusChanged");
 
   formAutofillParent._setStatus(true);

--- a/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
+++ b/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
@@ -37,17 +37,17 @@ add_task(async function test_profileSave
   formAutofillParent.observe(null, "formautofill-storage-changed", "update");
   do_check_eq(formAutofillParent._updateSavedFieldNames.called, false);
 });
 
 add_task(async function test_profileSavedFieldNames_update() {
   let formAutofillParent = new FormAutofillParent();
   await formAutofillParent.init();
   do_register_cleanup(function cleanup() {
-    Services.prefs.clearUserPref("browser.formautofill.enabled");
+    Services.prefs.clearUserPref("extensions.formautofill.addresses.enabled");
   });
 
   sinon.stub(profileStorage, "getAll");
   profileStorage.getAll.returns([]);
 
   // The set is empty if there's no profile in the store.
   formAutofillParent._updateSavedFieldNames();
   do_check_eq(Services.ppmm.initialProcessData.autofillSavedFieldNames.size, 0);