diff --git a/browser/extensions/formautofill/api.js b/browser/extensions/formautofill/api.js
index da1943a92976..000c393e8ecc 100644
--- a/browser/extensions/formautofill/api.js
+++ b/browser/extensions/formautofill/api.js
@@ -8,22 +8,10 @@
 
 const CACHED_STYLESHEETS = new WeakMap();
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "FormAutofill",
-  "resource://autofill/FormAutofill.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "FormAutofillStatus",
-  "resource://autofill/FormAutofillParent.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "FormAutofillParent",
-  "resource://autofill/FormAutofillParent.jsm"
-);
 ChromeUtils.defineESModuleGetters(this, {
+  FormAutofill: "resource://autofill/FormAutofill.sys.mjs",
+  FormAutofillParent: "resource://autofill/FormAutofillParent.sys.mjs",
+  FormAutofillStatus: "resource://autofill/FormAutofillParent.sys.mjs",
   AutoCompleteParent: "resource://gre/actors/AutoCompleteParent.sys.mjs",
 });
 
@@ -185,10 +173,10 @@ this.formautofill = class extends ExtensionAPI {
 
     ChromeUtils.registerWindowActor("FormAutofill", {
       parent: {
-        moduleURI: "resource://autofill/FormAutofillParent.jsm",
+        esModuleURI: "resource://autofill/FormAutofillParent.sys.mjs",
       },
       child: {
-        moduleURI: "resource://autofill/FormAutofillChild.jsm",
+        esModuleURI: "resource://autofill/FormAutofillChild.sys.mjs",
         events: {
           focusin: {},
           DOMFormBeforeSubmit: {},
diff --git a/browser/extensions/formautofill/content/autofillEditForms.js b/browser/extensions/formautofill/content/autofillEditForms.js
index 88a9364e88e9..40acb7923004 100644
--- a/browser/extensions/formautofill/content/autofillEditForms.js
+++ b/browser/extensions/formautofill/content/autofillEditForms.js
@@ -7,11 +7,11 @@
 
 "use strict";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
+const { FormAutofillUtils } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillUtils.sys.mjs"
 );
 
 class EditAutofillForm {
diff --git a/browser/extensions/formautofill/content/customElements.js b/browser/extensions/formautofill/content/customElements.js
index e5630b18bae8..3f269cfd5806 100644
--- a/browser/extensions/formautofill/content/customElements.js
+++ b/browser/extensions/formautofill/content/customElements.js
@@ -261,8 +261,8 @@
 
     _onCollapse() {
       if (this.showWarningText) {
-        let { FormAutofillParent } = ChromeUtils.import(
-          "resource://autofill/FormAutofillParent.jsm"
+        let { FormAutofillParent } = ChromeUtils.importESModule(
+          "resource://autofill/FormAutofillParent.sys.mjs"
         );
         FormAutofillParent.removeMessageObserver(this);
       }
@@ -298,8 +298,8 @@
       this.showWarningText = this._allFieldCategories && this._focusedCategory;
 
       if (this.showWarningText) {
-        let { FormAutofillParent } = ChromeUtils.import(
-          "resource://autofill/FormAutofillParent.jsm"
+        let { FormAutofillParent } = ChromeUtils.importESModule(
+          "resource://autofill/FormAutofillParent.sys.mjs"
         );
         FormAutofillParent.addMessageObserver(this);
         this.updateWarningNote();
diff --git a/browser/extensions/formautofill/content/editDialog.js b/browser/extensions/formautofill/content/editDialog.js
index 2a705dd5250c..77dcbb2ae051 100644
--- a/browser/extensions/formautofill/content/editDialog.js
+++ b/browser/extensions/formautofill/content/editDialog.js
@@ -7,11 +7,9 @@
 
 "use strict";
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "formAutofillStorage",
-  "resource://autofill/FormAutofillStorage.jsm"
-);
+ChromeUtils.defineESModuleGetters(this, {
+  formAutofillStorage: "resource://autofill/FormAutofillStorage.sys.mjs",
+});
 ChromeUtils.defineModuleGetter(
   this,
   "AutofillTelemetry",
diff --git a/browser/extensions/formautofill/content/manageDialog.js b/browser/extensions/formautofill/content/manageDialog.js
index ed585c351b9b..2a1e8356b8f4 100644
--- a/browser/extensions/formautofill/content/manageDialog.js
+++ b/browser/extensions/formautofill/content/manageDialog.js
@@ -16,8 +16,8 @@ const { AppConstants } = ChromeUtils.importESModule(
 const { XPCOMUtils } = ChromeUtils.importESModule(
   "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
 const { AutofillTelemetry } = ChromeUtils.import(
   "resource://autofill/AutofillTelemetry.jsm"
@@ -25,18 +25,10 @@ const { AutofillTelemetry } = ChromeUtils.import(
 
 ChromeUtils.defineESModuleGetters(this, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+  formAutofillStorage: "resource://autofill/FormAutofillStorage.sys.mjs",
 });
-ChromeUtils.defineModuleGetter(
-  this,
-  "formAutofillStorage",
-  "resource://autofill/FormAutofillStorage.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "FormAutofillUtils",
-  "resource://autofill/FormAutofillUtils.jsm"
-);
 
 const lazy = {};
 XPCOMUtils.defineLazyGetter(
diff --git a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
index bba27c5d4d20..0da9208956bc 100644
--- a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
+++ b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
@@ -1,7 +1,7 @@
 "use strict";
 
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
+const { FormAutofillUtils } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillUtils.sys.mjs"
 );
 
 ChromeUtils.defineESModuleGetters(this, {
diff --git a/browser/extensions/formautofill/test/browser/browser_fathom_cc.js b/browser/extensions/formautofill/test/browser/browser_fathom_cc.js
index 2614f371c830..560df57d8bc2 100644
--- a/browser/extensions/formautofill/test/browser/browser_fathom_cc.js
+++ b/browser/extensions/formautofill/test/browser/browser_fathom_cc.js
@@ -62,11 +62,11 @@ async function run_test(path, dirs) {
         browser,
         [{ eligibleElementSelector, file }],
         obj => {
-          const { FieldScanner } = ChromeUtils.import(
-            "resource://autofill/FormAutofillHeuristics.jsm"
+          const { FieldScanner } = ChromeUtils.importESModule(
+            "resource://autofill/FormAutofillHeuristics.sys.mjs"
           );
-          const { FormAutofillUtils } = ChromeUtils.import(
-            "resource://autofill/FormAutofillUtils.jsm"
+          const { FormAutofillUtils } = ChromeUtils.importESModule(
+            "resource://autofill/FormAutofillUtils.sys.mjs"
           );
 
           let eligibleFields = [];
diff --git a/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js b/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
index 9d40a086c173..6ca48161c2cd 100644
--- a/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
+++ b/browser/extensions/formautofill/test/browser/browser_privacyPreferences.js
@@ -13,8 +13,8 @@ const SELECTORS = {
   reauthCheckbox: "#creditCardReauthenticate checkbox",
 };
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
 
 // Visibility of form autofill group should be hidden when opening
diff --git a/browser/extensions/formautofill/test/browser/creditCard/browser_editCreditCardDialog.js b/browser/extensions/formautofill/test/browser/creditCard/browser_editCreditCardDialog.js
index 97fb7f9f1abe..4adcafd4c3ef 100644
--- a/browser/extensions/formautofill/test/browser/creditCard/browser_editCreditCardDialog.js
+++ b/browser/extensions/formautofill/test/browser/creditCard/browser_editCreditCardDialog.js
@@ -1,8 +1,8 @@
 "use strict";
 
 add_setup(async function() {
-  let { formAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  let { formAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   );
   await formAutofillStorage.initialize();
 });
@@ -280,8 +280,8 @@ add_task(async function test_editInvalidCreditCardNumber() {
   // Directly use FormAutofillStorage so we can set
   // sourceSync: true, since saveCreditCard uses FormAutofillParent
   // which doesn't expose this option.
-  let { formAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  let { formAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   );
   await formAutofillStorage.initialize();
   // Use `sourceSync: true` to bypass field normalization which will
diff --git a/browser/extensions/formautofill/test/browser/head.js b/browser/extensions/formautofill/test/browser/head.js
index 390c23ab819e..f9ef92e54e48 100644
--- a/browser/extensions/formautofill/test/browser/head.js
+++ b/browser/extensions/formautofill/test/browser/head.js
@@ -7,8 +7,8 @@ const { OSKeyStoreTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/OSKeyStoreTestUtils.sys.mjs"
 );
 
-const { FormAutofillParent } = ChromeUtils.import(
-  "resource://autofill/FormAutofillParent.jsm"
+const { FormAutofillParent } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillParent.sys.mjs"
 );
 
 const MANAGE_ADDRESSES_DIALOG_URL =
diff --git a/browser/extensions/formautofill/test/mochitest/formautofill_common.js b/browser/extensions/formautofill/test/mochitest/formautofill_common.js
index e5dabf1ea3ab..2089aef74d3e 100644
--- a/browser/extensions/formautofill/test/mochitest/formautofill_common.js
+++ b/browser/extensions/formautofill/test/mochitest/formautofill_common.js
@@ -10,8 +10,8 @@ let defaultTextColor;
 let defaultDisabledTextColor;
 let expectingPopup = null;
 
-const { FormAutofillUtils } = SpecialPowers.ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
+const { FormAutofillUtils } = SpecialPowers.ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillUtils.sys.mjs"
 );
 
 async function sleep(ms = 500, reason = "Intentionally wait for UI ready") {
diff --git a/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js b/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
index 5eaa661338c1..ef285858509d 100644
--- a/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
+++ b/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
@@ -2,18 +2,18 @@
 
 "use strict";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
+const { FormAutofillUtils } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillUtils.sys.mjs"
 );
 const { OSKeyStoreTestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/OSKeyStoreTestUtils.sys.mjs"
 );
 
-let { formAutofillStorage } = ChromeUtils.import(
-  "resource://autofill/FormAutofillStorage.jsm"
+let { formAutofillStorage } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillStorage.sys.mjs"
 );
 
 const {
diff --git a/browser/extensions/formautofill/test/unit/head.js b/browser/extensions/formautofill/test/unit/head.js
index d3371513358f..d2c51313921e 100644
--- a/browser/extensions/formautofill/test/unit/head.js
+++ b/browser/extensions/formautofill/test/unit/head.js
@@ -149,8 +149,8 @@ async function initProfileStorage(
   records,
   collectionName = "addresses"
 ) {
-  let { FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  let { FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   );
   let path = getTempFile(fileName).path;
   let profileStorage = new FormAutofillStorage(path);
@@ -216,11 +216,15 @@ var AddressDataLoader, FormAutofillUtils;
 
 async function runHeuristicsTest(patterns, fixturePathPrefix) {
   add_setup(async () => {
-    ({ FormAutofillHeuristics } = ChromeUtils.import(
-      "resource://autofill/FormAutofillHeuristics.jsm"
+    ({ FormAutofillHeuristics } = ChromeUtils.importESModule(
+      "resource://autofill/FormAutofillHeuristics.sys.mjs"
     ));
-    ({ AddressDataLoader, FormAutofillUtils, LabelUtils } = ChromeUtils.import(
-      "resource://autofill/FormAutofillUtils.jsm"
+    ({
+      AddressDataLoader,
+      FormAutofillUtils,
+      LabelUtils,
+    } = ChromeUtils.importESModule(
+      "resource://autofill/FormAutofillUtils.sys.mjs"
     ));
   });
 
diff --git a/browser/extensions/formautofill/test/unit/heuristics/test_known_strings.js b/browser/extensions/formautofill/test/unit/heuristics/test_known_strings.js
index b44bf0159f40..67412ab4d1cb 100644
--- a/browser/extensions/formautofill/test/unit/heuristics/test_known_strings.js
+++ b/browser/extensions/formautofill/test/unit/heuristics/test_known_strings.js
@@ -128,8 +128,8 @@ const KNOWN_NAMES = {
 };
 
 add_setup(async () => {
-  ({ FormAutofillHeuristics } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHeuristics.jsm"
+  ({ FormAutofillHeuristics } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHeuristics.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_activeStatus.js b/browser/extensions/formautofill/test/unit/test_activeStatus.js
index a8c454ff0524..47d79b02e5ce 100644
--- a/browser/extensions/formautofill/test/unit/test_activeStatus.js
+++ b/browser/extensions/formautofill/test/unit/test_activeStatus.js
@@ -7,8 +7,8 @@
 let FormAutofillStatus;
 
 add_setup(async () => {
-  ({ FormAutofillStatus } = ChromeUtils.import(
-    "resource://autofill/FormAutofillParent.jsm"
+  ({ FormAutofillStatus } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillParent.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_addressDataLoader.js b/browser/extensions/formautofill/test/unit/test_addressDataLoader.js
index d61d4b20134f..5d4a5a61f9d6 100644
--- a/browser/extensions/formautofill/test/unit/test_addressDataLoader.js
+++ b/browser/extensions/formautofill/test/unit/test_addressDataLoader.js
@@ -17,8 +17,8 @@ const SUPPORT_COUNTRIES_TESTCASES = [
 
 var AddressDataLoader, FormAutofillUtils;
 add_setup(async () => {
-  ({ AddressDataLoader, FormAutofillUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ AddressDataLoader, FormAutofillUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
index d5af261fab23..f8fbefde2791 100644
--- a/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_autofillFormFields.js
@@ -11,8 +11,8 @@ const { setTimeout, clearTimeout } = ChromeUtils.importESModule(
 
 var FormAutofillHandler, OSKeyStore;
 add_setup(async () => {
-  ({ FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  ({ FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   ));
   ({ OSKeyStore } = ChromeUtils.importESModule(
     "resource://gre/modules/OSKeyStore.sys.mjs"
diff --git a/browser/extensions/formautofill/test/unit/test_clearPopulatedForm.js b/browser/extensions/formautofill/test/unit/test_clearPopulatedForm.js
index 4b14b1e54cfa..3da2e2961271 100644
--- a/browser/extensions/formautofill/test/unit/test_clearPopulatedForm.js
+++ b/browser/extensions/formautofill/test/unit/test_clearPopulatedForm.js
@@ -82,8 +82,8 @@ const TESTCASES = [
 ];
 
 add_task(async function do_test() {
-  let { FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  let { FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   );
   for (let test of TESTCASES) {
     info("Test case: " + test.description);
diff --git a/browser/extensions/formautofill/test/unit/test_collectFormFields.js b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
index 0dbf47f0124d..6fe81934b400 100644
--- a/browser/extensions/formautofill/test/unit/test_collectFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_collectFormFields.js
@@ -6,8 +6,8 @@
 
 var FormAutofillHandler;
 add_setup(async () => {
-  ({ FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  ({ FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_createRecords.js b/browser/extensions/formautofill/test/unit/test_createRecords.js
index 7ed814cc1f44..80be1cab5bd4 100644
--- a/browser/extensions/formautofill/test/unit/test_createRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_createRecords.js
@@ -6,8 +6,8 @@
 
 var FormAutofillHandler;
 add_task(async function seutp() {
-  ({ FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  ({ FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_creditCardRecords.js b/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
index d1955932c999..e89184b5d9d1 100644
--- a/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_creditCardRecords.js
@@ -14,11 +14,11 @@ const { CreditCard } = ChromeUtils.importESModule(
 let FormAutofillStorage;
 let CREDIT_CARD_SCHEMA_VERSION;
 add_setup(async () => {
-  ({ FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  ({ FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   ));
-  ({ CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorageBase.jsm"
+  ({ CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorageBase.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_extractLabelStrings.js b/browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
index e27d3afa36fc..ebb42c41bef4 100644
--- a/browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
+++ b/browser/extensions/formautofill/test/unit/test_extractLabelStrings.js
@@ -2,8 +2,8 @@
 
 var LabelUtils;
 add_task(async function() {
-  ({ LabelUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ LabelUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_findLabelElements.js b/browser/extensions/formautofill/test/unit/test_findLabelElements.js
index bf9d36f1026c..783c5c30ec01 100644
--- a/browser/extensions/formautofill/test/unit/test_findLabelElements.js
+++ b/browser/extensions/formautofill/test/unit/test_findLabelElements.js
@@ -2,8 +2,8 @@
 
 var LabelUtils;
 add_task(async function() {
-  ({ LabelUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ LabelUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js b/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
index 49198568ce89..7d61329234ba 100644
--- a/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
+++ b/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles.js
@@ -6,8 +6,8 @@
 
 var FormAutofillHandler;
 add_task(async function() {
-  ({ FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  ({ FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles_locales.js b/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles_locales.js
index 843f1c266a5a..1260f21f1621 100644
--- a/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles_locales.js
+++ b/browser/extensions/formautofill/test/unit/test_getAdaptedProfiles_locales.js
@@ -10,8 +10,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 let FormAutofillHandler;
 add_task(async function() {
-  ({ FormAutofillHandler } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHandler.jsm"
+  ({ FormAutofillHandler } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHandler.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js b/browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
index 741fd52c6d16..ce06d5496d4a 100644
--- a/browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
+++ b/browser/extensions/formautofill/test/unit/test_getCategoriesFromFieldNames.js
@@ -2,8 +2,8 @@
 
 var FormAutofillUtils;
 add_task(async function() {
-  ({ FormAutofillUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ FormAutofillUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getFormInputDetails.js b/browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
index 9839a54eb31e..8ddb2136b691 100644
--- a/browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
+++ b/browser/extensions/formautofill/test/unit/test_getFormInputDetails.js
@@ -2,8 +2,8 @@
 
 var FormAutofillContent;
 add_task(async function() {
-  ({ FormAutofillContent } = ChromeUtils.import(
-    "resource://autofill/FormAutofillContent.jsm"
+  ({ FormAutofillContent } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillContent.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getInfo.js b/browser/extensions/formautofill/test/unit/test_getInfo.js
index a9a2423d3e7b..0db9a10c2cfb 100644
--- a/browser/extensions/formautofill/test/unit/test_getInfo.js
+++ b/browser/extensions/formautofill/test/unit/test_getInfo.js
@@ -1,18 +1,18 @@
 "use strict";
 
-const { FieldScanner } = ChromeUtils.import(
-  "resource://autofill/FormAutofillHeuristics.jsm"
+const { FieldScanner } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillHeuristics.sys.mjs"
 );
 var FormAutofillHeuristics, LabelUtils, FormAutofill;
 add_task(async function() {
-  ({ FormAutofillHeuristics } = ChromeUtils.import(
-    "resource://autofill/FormAutofillHeuristics.jsm"
+  ({ FormAutofillHeuristics } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillHeuristics.sys.mjs"
   ));
-  ({ LabelUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ LabelUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
-  ({ FormAutofill } = ChromeUtils.import(
-    "resource://autofill/FormAutofill.jsm"
+  ({ FormAutofill } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofill.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_getRecords.js b/browser/extensions/formautofill/test/unit/test_getRecords.js
index 147b328f857d..9a7e5e6ac79a 100644
--- a/browser/extensions/formautofill/test/unit/test_getRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_getRecords.js
@@ -11,8 +11,8 @@ const { CreditCard } = ChromeUtils.importESModule(
 let FormAutofillParent, FormAutofillStatus;
 let OSKeyStore;
 add_setup(async () => {
-  ({ FormAutofillParent, FormAutofillStatus } = ChromeUtils.import(
-    "resource://autofill/FormAutofillParent.jsm"
+  ({ FormAutofillParent, FormAutofillStatus } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillParent.sys.mjs"
   ));
   ({ OSKeyStore } = ChromeUtils.importESModule(
     "resource://gre/modules/OSKeyStore.sys.mjs"
diff --git a/browser/extensions/formautofill/test/unit/test_isAddressAutofillAvailable.js b/browser/extensions/formautofill/test/unit/test_isAddressAutofillAvailable.js
index 499c84d4c8aa..2d2940c33e87 100644
--- a/browser/extensions/formautofill/test/unit/test_isAddressAutofillAvailable.js
+++ b/browser/extensions/formautofill/test/unit/test_isAddressAutofillAvailable.js
@@ -7,8 +7,8 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
 
 add_task(async function test_defaultTestEnvironment() {
diff --git a/browser/extensions/formautofill/test/unit/test_isCJKName.js b/browser/extensions/formautofill/test/unit/test_isCJKName.js
index e943ccd05c32..d47c61e8d714 100644
--- a/browser/extensions/formautofill/test/unit/test_isCJKName.js
+++ b/browser/extensions/formautofill/test/unit/test_isCJKName.js
@@ -6,8 +6,8 @@
 
 var FormAutofillNameUtils;
 add_setup(async () => {
-  ({ FormAutofillNameUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillNameUtils.jsm"
+  ({ FormAutofillNameUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillNameUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_isCreditCardAutofillAvailable.js b/browser/extensions/formautofill/test/unit/test_isCreditCardAutofillAvailable.js
index 32a4d93b1b3d..5be5101ee684 100644
--- a/browser/extensions/formautofill/test/unit/test_isCreditCardAutofillAvailable.js
+++ b/browser/extensions/formautofill/test/unit/test_isCreditCardAutofillAvailable.js
@@ -4,8 +4,8 @@
 
 "use strict";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
+const { FormAutofill } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofill.sys.mjs"
 );
 
 add_task(async function test_defaultTestEnvironment() {
diff --git a/browser/extensions/formautofill/test/unit/test_isCreditCardOrAddressFieldType.js b/browser/extensions/formautofill/test/unit/test_isCreditCardOrAddressFieldType.js
index 535a781e934e..60c639010db3 100644
--- a/browser/extensions/formautofill/test/unit/test_isCreditCardOrAddressFieldType.js
+++ b/browser/extensions/formautofill/test/unit/test_isCreditCardOrAddressFieldType.js
@@ -2,8 +2,8 @@
 
 var FormAutofillUtils;
 add_setup(async () => {
-  ({ FormAutofillUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ FormAutofillUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js b/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
index cf5bb9130c2d..dd7953b8eb9c 100644
--- a/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
+++ b/browser/extensions/formautofill/test/unit/test_markAsAutofillField.js
@@ -162,8 +162,8 @@ let markedFieldId = [];
 
 var FormAutofillContent;
 add_setup(async () => {
-  ({ FormAutofillContent } = ChromeUtils.import(
-    "resource://autofill/FormAutofillContent.jsm"
+  ({ FormAutofillContent } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillContent.sys.mjs"
   ));
 
   FormAutofillContent._markAsAutofillField = function(field) {
diff --git a/browser/extensions/formautofill/test/unit/test_migrateRecords.js b/browser/extensions/formautofill/test/unit/test_migrateRecords.js
index c67ea1dcb0e8..51b946484ccb 100644
--- a/browser/extensions/formautofill/test/unit/test_migrateRecords.js
+++ b/browser/extensions/formautofill/test/unit/test_migrateRecords.js
@@ -6,18 +6,18 @@
 
 let FormAutofillStorage;
 add_setup(async () => {
-  ({ FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  ({ FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   ));
 });
 
 const TEST_STORE_FILE_NAME = "test-profile.json";
 
-const { ADDRESS_SCHEMA_VERSION } = ChromeUtils.import(
-  "resource://autofill/FormAutofillStorageBase.jsm"
+const { ADDRESS_SCHEMA_VERSION } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillStorageBase.sys.mjs"
 );
-const { CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.import(
-  "resource://autofill/FormAutofillStorageBase.jsm"
+const { CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillStorageBase.sys.mjs"
 );
 
 const ADDRESS_TESTCASES = [
diff --git a/browser/extensions/formautofill/test/unit/test_nameUtils.js b/browser/extensions/formautofill/test/unit/test_nameUtils.js
index 323badd65215..c9c5bc38efa4 100644
--- a/browser/extensions/formautofill/test/unit/test_nameUtils.js
+++ b/browser/extensions/formautofill/test/unit/test_nameUtils.js
@@ -6,8 +6,8 @@
 
 var FormAutofillNameUtils;
 add_task(async function() {
-  ({ FormAutofillNameUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillNameUtils.jsm"
+  ({ FormAutofillNameUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillNameUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js b/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
index 1cc8a5428c46..1c252e04bb4d 100644
--- a/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
+++ b/browser/extensions/formautofill/test/unit/test_onFormSubmitted.js
@@ -2,8 +2,8 @@
 
 var FormAutofillContent;
 add_setup(async () => {
-  ({ FormAutofillContent } = ChromeUtils.import(
-    "resource://autofill/FormAutofillContent.jsm"
+  ({ FormAutofillContent } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillContent.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js b/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
index fe9f64c23c0a..63753436dfee 100644
--- a/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
+++ b/browser/extensions/formautofill/test/unit/test_parseAddressFormat.js
@@ -2,8 +2,8 @@
 
 var FormAutofillUtils;
 add_setup(async () => {
-  ({ FormAutofillUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ FormAutofillUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_phoneNumber.js b/browser/extensions/formautofill/test/unit/test_phoneNumber.js
index 7b4f7305b6e7..1c1d67e16630 100644
--- a/browser/extensions/formautofill/test/unit/test_phoneNumber.js
+++ b/browser/extensions/formautofill/test/unit/test_phoneNumber.js
@@ -6,11 +6,11 @@
 
 var PhoneNumber, PhoneNumberNormalizer;
 add_setup(async () => {
-  ({ PhoneNumber } = ChromeUtils.import(
-    "resource://autofill/phonenumberutils/PhoneNumber.jsm"
+  ({ PhoneNumber } = ChromeUtils.importESModule(
+    "resource://autofill/phonenumberutils/PhoneNumber.sys.mjs"
   ));
-  ({ PhoneNumberNormalizer } = ChromeUtils.import(
-    "resource://autofill/phonenumberutils/PhoneNumberNormalizer.jsm"
+  ({ PhoneNumberNormalizer } = ChromeUtils.importESModule(
+    "resource://autofill/phonenumberutils/PhoneNumberNormalizer.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_previewFormFields.js b/browser/extensions/formautofill/test/unit/test_previewFormFields.js
index ea01b0525f3f..2e6ae16a325b 100644
--- a/browser/extensions/formautofill/test/unit/test_previewFormFields.js
+++ b/browser/extensions/formautofill/test/unit/test_previewFormFields.js
@@ -3,14 +3,14 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-const { FormAutofillHandler } = ChromeUtils.import(
-  "resource://autofill/FormAutofillHandler.jsm"
+const { FormAutofillHandler } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillHandler.sys.mjs"
 );
 
 // Bug 1762063 - we need to fix this pattern of having to wrap destructuring calls in parentheses.
 // We can't do a standard destructuring call because FormAutofillUtils is already declared as a var in head.js
-({ FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
+({ FormAutofillUtils } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillUtils.sys.mjs"
 ));
 const { FIELD_STATES } = FormAutofillUtils;
 const PREVIEW = FIELD_STATES.PREVIEW;
diff --git a/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js b/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
index f07c0ff9c500..7a28f646342f 100644
--- a/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
+++ b/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
@@ -2,8 +2,8 @@
 
 var AddressResult, CreditCardResult;
 add_setup(async () => {
-  ({ AddressResult, CreditCardResult } = ChromeUtils.import(
-    "resource://autofill/ProfileAutoCompleteResult.jsm"
+  ({ AddressResult, CreditCardResult } = ChromeUtils.importESModule(
+    "resource://autofill/ProfileAutoCompleteResult.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_reconcile.js b/browser/extensions/formautofill/test/unit/test_reconcile.js
index 4f8de87b6c29..80bdb85e1d6b 100644
--- a/browser/extensions/formautofill/test/unit/test_reconcile.js
+++ b/browser/extensions/formautofill/test/unit/test_reconcile.js
@@ -1,8 +1,8 @@
 "use strict";
 
 const TEST_STORE_FILE_NAME = "test-profile.json";
-const { CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.import(
-  "resource://autofill/FormAutofillStorageBase.jsm"
+const { CREDIT_CARD_SCHEMA_VERSION } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillStorageBase.sys.mjs"
 );
 
 // NOTE: a guide to reading these test-cases:
diff --git a/browser/extensions/formautofill/test/unit/test_savedFieldNames.js b/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
index 796742df6c8d..6e3474c06dd5 100644
--- a/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
+++ b/browser/extensions/formautofill/test/unit/test_savedFieldNames.js
@@ -7,8 +7,8 @@
 let FormAutofillStatus;
 
 add_setup(async () => {
-  ({ FormAutofillStatus } = ChromeUtils.import(
-    "resource://autofill/FormAutofillParent.jsm"
+  ({ FormAutofillStatus } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillParent.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_storage_remove.js b/browser/extensions/formautofill/test/unit/test_storage_remove.js
index c08bf96204ec..2204b4860e14 100644
--- a/browser/extensions/formautofill/test/unit/test_storage_remove.js
+++ b/browser/extensions/formautofill/test/unit/test_storage_remove.js
@@ -6,8 +6,8 @@
 
 let FormAutofillStorage;
 add_setup(async () => {
-  ({ FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  ({ FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_storage_tombstones.js b/browser/extensions/formautofill/test/unit/test_storage_tombstones.js
index e0081545937b..cf2609048b45 100644
--- a/browser/extensions/formautofill/test/unit/test_storage_tombstones.js
+++ b/browser/extensions/formautofill/test/unit/test_storage_tombstones.js
@@ -6,8 +6,8 @@
 
 let FormAutofillStorage;
 add_setup(async () => {
-  ({ FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  ({ FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_sync.js b/browser/extensions/formautofill/test/unit/test_sync.js
index 13981baa60fb..fcd81b8a9ce2 100644
--- a/browser/extensions/formautofill/test/unit/test_sync.js
+++ b/browser/extensions/formautofill/test/unit/test_sync.js
@@ -20,7 +20,7 @@ const {
   sanitizeStorageObject,
   AutofillRecord,
   AddressesEngine,
-} = ChromeUtils.import("resource://autofill/FormAutofillSync.jsm");
+} = ChromeUtils.importESModule("resource://autofill/FormAutofillSync.sys.mjs");
 
 Services.prefs.setCharPref("extensions.formautofill.loglevel", "Trace");
 initTestLogging("Trace");
diff --git a/browser/extensions/formautofill/test/unit/test_sync_deprecate_credit_card_v4.js b/browser/extensions/formautofill/test/unit/test_sync_deprecate_credit_card_v4.js
index 85b06e027554..418808d53e55 100644
--- a/browser/extensions/formautofill/test/unit/test_sync_deprecate_credit_card_v4.js
+++ b/browser/extensions/formautofill/test/unit/test_sync_deprecate_credit_card_v4.js
@@ -13,8 +13,8 @@ const { Service } = ChromeUtils.importESModule(
   "resource://services-sync/service.sys.mjs"
 );
 
-const { CreditCardsEngine } = ChromeUtils.import(
-  "resource://autofill/FormAutofillSync.jsm"
+const { CreditCardsEngine } = ChromeUtils.importESModule(
+  "resource://autofill/FormAutofillSync.sys.mjs"
 );
 
 Services.prefs.setCharPref("extensions.formautofill.loglevel", "Trace");
diff --git a/browser/extensions/formautofill/test/unit/test_toOneLineAddress.js b/browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
index 478a22578ece..9bafa41d9032 100644
--- a/browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
+++ b/browser/extensions/formautofill/test/unit/test_toOneLineAddress.js
@@ -2,8 +2,8 @@
 
 var FormAutofillUtils;
 add_setup(async () => {
-  ({ FormAutofillUtils } = ChromeUtils.import(
-    "resource://autofill/FormAutofillUtils.jsm"
+  ({ FormAutofillUtils } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillUtils.sys.mjs"
   ));
 });
 
diff --git a/browser/extensions/formautofill/test/unit/test_transformFields.js b/browser/extensions/formautofill/test/unit/test_transformFields.js
index 1d45ce4536d4..47ba396e0694 100644
--- a/browser/extensions/formautofill/test/unit/test_transformFields.js
+++ b/browser/extensions/formautofill/test/unit/test_transformFields.js
@@ -6,8 +6,8 @@
 
 let FormAutofillStorage;
 add_setup(async () => {
-  ({ FormAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  ({ FormAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   ));
 });
 
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 2280ad9d6957..11a41fc1c868 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -788,10 +788,10 @@ function startup() {
         actors: {
           FormAutofill: {
             parent: {
-              moduleURI: "resource://autofill/FormAutofillParent.jsm",
+              esModuleURI: "resource://autofill/FormAutofillParent.sys.mjs",
             },
             child: {
-              moduleURI: "resource://autofill/FormAutofillChild.jsm",
+              esModuleURI: "resource://autofill/FormAutofillChild.sys.mjs",
               events: {
                 focusin: {},
                 DOMFormBeforeSubmit: {},
diff --git a/services/sync/tps/extensions/tps/resource/modules/formautofill.sys.mjs b/services/sync/tps/extensions/tps/resource/modules/formautofill.sys.mjs
index f587a604b411..587d7668f453 100644
--- a/services/sync/tps/extensions/tps/resource/modules/formautofill.sys.mjs
+++ b/services/sync/tps/extensions/tps/resource/modules/formautofill.sys.mjs
@@ -11,14 +11,9 @@ import { Logger } from "resource://tps/logger.sys.mjs";
 
 const lazy = {};
 
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "formAutofillStorage",
-  "resource://autofill/FormAutofillStorage.jsm"
-);
-
 ChromeUtils.defineESModuleGetters(lazy, {
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+  formAutofillStorage: "resource://autofill/FormAutofillStorage.sys.mjs",
 });
 
 class FormAutofillBase {
diff --git a/toolkit/components/formautofill/AddressComponent.sys.mjs b/toolkit/components/formautofill/AddressComponent.sys.mjs
index 58c199b50ef8..8464557b40ae 100644
--- a/toolkit/components/formautofill/AddressComponent.sys.mjs
+++ b/toolkit/components/formautofill/AddressComponent.sys.mjs
@@ -2,17 +2,13 @@
  * 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/. */
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
-  PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.jsm",
+ChromeUtils.defineESModuleGetters(lazy, {
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
+  PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.sys.mjs",
 });
 
 class AddressField {
diff --git a/toolkit/components/formautofill/AutofillTelemetry.sys.mjs b/toolkit/components/formautofill/AutofillTelemetry.sys.mjs
index c91f56cb100f..0bf0f6f7bc41 100644
--- a/toolkit/components/formautofill/AutofillTelemetry.sys.mjs
+++ b/toolkit/components/formautofill/AutofillTelemetry.sys.mjs
@@ -2,12 +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/. */
 
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
-);
-const { FormAutofillCreditCardSection } = ChromeUtils.import(
-  "resource://autofill/FormAutofillHandler.jsm"
-);
+import { FormAutofillCreditCardSection } from "resource://autofill/FormAutofillHandler.sys.mjs";
+import { FormAutofillUtils } from "resource://autofill/FormAutofillUtils.sys.mjs";
 
 const { FIELD_STATES } = FormAutofillUtils;
 
diff --git a/toolkit/components/formautofill/CreditCardRuleset.sys.mjs b/toolkit/components/formautofill/CreditCardRuleset.sys.mjs
index 54f1f6266afd..faeab0fca248 100644
--- a/toolkit/components/formautofill/CreditCardRuleset.sys.mjs
+++ b/toolkit/components/formautofill/CreditCardRuleset.sys.mjs
@@ -37,15 +37,9 @@ import {
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
-});
-ChromeUtils.defineModuleGetter(
-  lazy,
-  "FormAutofillUtils",
-  "resource://autofill/FormAutofillUtils.jsm"
-);
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  LabelUtils: "resource://autofill/FormAutofillUtils.jsm",
+  LabelUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
 });
 
 /**
diff --git a/toolkit/components/formautofill/FormAutofillChild.sys.mjs b/toolkit/components/formautofill/FormAutofillChild.sys.mjs
index 7f3d723d27a6..d610b6866279 100644
--- a/toolkit/components/formautofill/FormAutofillChild.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillChild.sys.mjs
@@ -2,21 +2,16 @@
  * 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/. */
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   AutoCompleteChild: "resource://gre/actors/AutoCompleteChild.sys.mjs",
+  FormAutofill: "resource://autofill/FormAutofill.sys.mjs",
+  FormAutofillContent: "resource://autofill/FormAutofillContent.sys.mjs",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FormAutofill: "resource://autofill/FormAutofill.jsm",
-  FormAutofillContent: "resource://autofill/FormAutofillContent.jsm",
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
-});
-
 /**
  * Handles content's interactions for the frame.
  */
diff --git a/toolkit/components/formautofill/FormAutofillContent.sys.mjs b/toolkit/components/formautofill/FormAutofillContent.sys.mjs
index 97c1359f828c..54b479f5ba70 100644
--- a/toolkit/components/formautofill/FormAutofillContent.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillContent.sys.mjs
@@ -16,19 +16,19 @@ import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  AddressResult: "resource://autofill/ProfileAutoCompleteResult.sys.mjs",
+  CreditCardResult: "resource://autofill/ProfileAutoCompleteResult.sys.mjs",
+  FormAutofill: "resource://autofill/FormAutofill.sys.mjs",
+  FormAutofillHandler: "resource://autofill/FormAutofillHandler.sys.mjs",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
   InsecurePasswordUtils: "resource://gre/modules/InsecurePasswordUtils.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AddressResult: "resource://autofill/ProfileAutoCompleteResult.jsm",
   ComponentUtils: "resource://gre/modules/ComponentUtils.jsm",
-  CreditCardResult: "resource://autofill/ProfileAutoCompleteResult.jsm",
   AutofillTelemetry: "resource://autofill/AutofillTelemetry.jsm",
-  FormAutofill: "resource://autofill/FormAutofill.jsm",
-  FormAutofillHandler: "resource://autofill/FormAutofillHandler.jsm",
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(
diff --git a/toolkit/components/formautofill/FormAutofillHandler.sys.mjs b/toolkit/components/formautofill/FormAutofillHandler.sys.mjs
index 74e4c19e4bde..3067552d32e2 100644
--- a/toolkit/components/formautofill/FormAutofillHandler.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillHandler.sys.mjs
@@ -7,26 +7,20 @@
  */
 
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
+import { FormAutofillUtils } from "resource://autofill/FormAutofillUtils.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
-);
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+  FormAutofillHeuristics: "resource://autofill/FormAutofillHeuristics.sys.mjs",
   FormLikeFactory: "resource://gre/modules/FormLikeFactory.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AutofillTelemetry: "resource://autofill/AutofillTelemetry.jsm",
-  FormAutofillHeuristics: "resource://autofill/FormAutofillHeuristics.jsm",
 });
 
 const formFillController = Cc[
diff --git a/toolkit/components/formautofill/FormAutofillHeuristics.sys.mjs b/toolkit/components/formautofill/FormAutofillHeuristics.sys.mjs
index 17609ec72d8d..92b32884aff2 100644
--- a/toolkit/components/formautofill/FormAutofillHeuristics.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillHeuristics.sys.mjs
@@ -7,22 +7,16 @@
  */
 
 export let FormAutofillHeuristics;
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  creditCardRulesets: "resource://autofill/CreditCardRuleset.jsm",
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
-  LabelUtils: "resource://autofill/FormAutofillUtils.jsm",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
+  LabelUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
+  creditCardRulesets: "resource://autofill/CreditCardRuleset.sys.mjs",
 });
 
 XPCOMUtils.defineLazyGetter(lazy, "log", () =>
diff --git a/toolkit/components/formautofill/FormAutofillParent.sys.mjs b/toolkit/components/formautofill/FormAutofillParent.sys.mjs
index 52d074d8cb54..8e8e112ee2d9 100644
--- a/toolkit/components/formautofill/FormAutofillParent.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillParent.sys.mjs
@@ -27,27 +27,23 @@
 
 // We expose a singleton from this module. Some tests may import the
 // constructor via a backstage pass.
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
+import { FormAutofillUtils } from "resource://autofill/FormAutofillUtils.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
-);
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
+  AddressComparison: "resource://autofill/AddressComponent.sys.mjs",
+  AddressComponent: "resource://autofill/AddressComponent.sys.mjs",
+  FormAutofillPreferences:
+    "resource://autofill/FormAutofillPreferences.sys.mjs",
+  FormAutofillPrompter: "resource://autofill/FormAutofillPrompter.sys.mjs",
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  AddressComparison: "resource://autofill/AddressComponent.jsm",
-  AddressComponent: "resource://autofill/AddressComponent.jsm",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
-  FormAutofillPreferences: "resource://autofill/FormAutofillPreferences.jsm",
-  FormAutofillPrompter: "resource://autofill/FormAutofillPrompter.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(lazy, "log", () =>
@@ -273,8 +269,8 @@ export let FormAutofillStatus = {
 // Lazily load the storage JSM to avoid disk I/O until absolutely needed.
 // Once storage is loaded we need to update saved field names and inform content processes.
 XPCOMUtils.defineLazyGetter(lazy, "gFormAutofillStorage", () => {
-  let { formAutofillStorage } = ChromeUtils.import(
-    "resource://autofill/FormAutofillStorage.jsm"
+  let { formAutofillStorage } = ChromeUtils.importESModule(
+    "resource://autofill/FormAutofillStorage.sys.mjs"
   );
   lazy.log.debug("Loading formAutofillStorage");
 
diff --git a/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs b/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs
index 8d91d57c7825..25f593b47d93 100644
--- a/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillPreferences.sys.mjs
@@ -14,12 +14,8 @@ const MANAGE_ADDRESSES_URL =
 const MANAGE_CREDITCARDS_URL =
   "chrome://formautofill/content/manageCreditCards.xhtml";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
-);
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
+import { FormAutofillUtils } from "resource://autofill/FormAutofillUtils.sys.mjs";
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
 
 const lazy = {};
diff --git a/toolkit/components/formautofill/FormAutofillStorageBase.sys.mjs b/toolkit/components/formautofill/FormAutofillStorageBase.sys.mjs
index 84e674ec2424..57e9e09fda6f 100644
--- a/toolkit/components/formautofill/FormAutofillStorageBase.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillStorageBase.sys.mjs
@@ -122,24 +122,21 @@
  * this new field.
  */
 
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+  FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.sys.mjs",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
+  PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.sys.mjs",
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   AutofillTelemetry: "resource://autofill/AutofillTelemetry.jsm",
-  FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.jsm",
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
-  PhoneNumber: "resource://autofill/phonenumberutils/PhoneNumber.jsm",
 });
 
 const CryptoHash = Components.Constructor(
diff --git a/toolkit/components/formautofill/FormAutofillSync.sys.mjs b/toolkit/components/formautofill/FormAutofillSync.sys.mjs
index 09de6f5e238d..4ad1684e9756 100644
--- a/toolkit/components/formautofill/FormAutofillSync.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillSync.sys.mjs
@@ -14,16 +14,12 @@ import { Utils } from "resource://services-sync/util.sys.mjs";
 const { SCORE_INCREMENT_XLARGE } = ChromeUtils.import(
   "resource://services-sync/constants.js"
 );
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   Log: "resource://gre/modules/Log.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  formAutofillStorage: "resource://autofill/FormAutofillStorage.jsm",
+  formAutofillStorage: "resource://autofill/FormAutofillStorage.sys.mjs",
 });
 
 // A helper to sanitize address and creditcard records suitable for logging.
diff --git a/toolkit/components/formautofill/FormAutofillUtils.sys.mjs b/toolkit/components/formautofill/FormAutofillUtils.sys.mjs
index 6b649a62bc71..a819301fdf4e 100644
--- a/toolkit/components/formautofill/FormAutofillUtils.sys.mjs
+++ b/toolkit/components/formautofill/FormAutofillUtils.sys.mjs
@@ -56,22 +56,17 @@ const ELIGIBLE_INPUT_TYPES = ["text", "email", "tel", "number", "month"];
 // attacks that fill the user's hard drive(s).
 const MAX_FIELD_VALUE_LENGTH = 200;
 
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+  FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.sys.mjs",
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FormAutofillNameUtils: "resource://autofill/FormAutofillNameUtils.jsm",
-});
-
 export let AddressDataLoader = {
   // Status of address data loading. We'll load all the countries with basic level 1
   // information while requesting conutry information, and set country to true.
diff --git a/toolkit/components/formautofill/ProfileAutoCompleteResult.sys.mjs b/toolkit/components/formautofill/ProfileAutoCompleteResult.sys.mjs
index 0f6ddad5a3fa..82e945865fda 100644
--- a/toolkit/components/formautofill/ProfileAutoCompleteResult.sys.mjs
+++ b/toolkit/components/formautofill/ProfileAutoCompleteResult.sys.mjs
@@ -8,10 +8,7 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
-});
-
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
 });
 
 XPCOMUtils.defineLazyGetter(
diff --git a/toolkit/components/formautofill/android/FormAutofillStorage.sys.mjs b/toolkit/components/formautofill/android/FormAutofillStorage.sys.mjs
index 64501bfb4f67..958d028827ca 100644
--- a/toolkit/components/formautofill/android/FormAutofillStorage.sys.mjs
+++ b/toolkit/components/formautofill/android/FormAutofillStorage.sys.mjs
@@ -10,11 +10,11 @@
 // constructor via a backstage pass.
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
-const {
+import {
   FormAutofillStorageBase,
   CreditCardsBase,
   AddressesBase,
-} = ChromeUtils.import("resource://autofill/FormAutofillStorageBase.jsm");
+} from "resource://autofill/FormAutofillStorageBase.sys.mjs";
 import { JSONFile } from "resource://gre/modules/JSONFile.sys.mjs";
 
 const lazy = {};
diff --git a/toolkit/components/formautofill/default/FormAutofillPrompter.sys.mjs b/toolkit/components/formautofill/default/FormAutofillPrompter.sys.mjs
index 615bac8cd729..1192f45c8e3b 100644
--- a/toolkit/components/formautofill/default/FormAutofillPrompter.sys.mjs
+++ b/toolkit/components/formautofill/default/FormAutofillPrompter.sys.mjs
@@ -8,17 +8,13 @@
  */
 
 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
+import { FormAutofillUtils } from "resource://autofill/FormAutofillUtils.sys.mjs";
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const { AutofillTelemetry } = ChromeUtils.import(
   "resource://autofill/AutofillTelemetry.jsm"
 );
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-const { FormAutofillUtils } = ChromeUtils.import(
-  "resource://autofill/FormAutofillUtils.jsm"
-);
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 
 const lazy = {};
 
diff --git a/toolkit/components/formautofill/default/FormAutofillStorage.sys.mjs b/toolkit/components/formautofill/default/FormAutofillStorage.sys.mjs
index 5eac5ad33017..3435ff12e3b5 100644
--- a/toolkit/components/formautofill/default/FormAutofillStorage.sys.mjs
+++ b/toolkit/components/formautofill/default/FormAutofillStorage.sys.mjs
@@ -8,30 +8,22 @@
 
 // We expose a singleton from this module. Some tests may import the
 // constructor via a backstage pass.
-const { FormAutofill } = ChromeUtils.import(
-  "resource://autofill/FormAutofill.jsm"
-);
-
-const {
-  FormAutofillStorageBase,
-  CreditCardsBase,
+import {
   AddressesBase,
-} = ChromeUtils.import("resource://autofill/FormAutofillStorageBase.jsm");
-
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+  CreditCardsBase,
+  FormAutofillStorageBase,
+} from "resource://autofill/FormAutofillStorageBase.sys.mjs";
+import { FormAutofill } from "resource://autofill/FormAutofill.sys.mjs";
 
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   CreditCard: "resource://gre/modules/CreditCard.sys.mjs",
+  FormAutofillUtils: "resource://autofill/FormAutofillUtils.sys.mjs",
   JSONFile: "resource://gre/modules/JSONFile.sys.mjs",
   OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
 });
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
-  FormAutofillUtils: "resource://autofill/FormAutofillUtils.jsm",
-});
-
 const PROFILE_JSON_FILE_NAME = "autofill-profiles.json";
 
 class Addresses extends AddressesBase {
diff --git a/toolkit/components/formautofill/jar.mn b/toolkit/components/formautofill/jar.mn
index b80206a560de..d840f267d336 100644
--- a/toolkit/components/formautofill/jar.mn
+++ b/toolkit/components/formautofill/jar.mn
@@ -4,8 +4,8 @@
 
 toolkit.jar:
 % resource autofill %res/autofill/
-  res/autofill/ (./*.jsm)
-  res/autofill/phonenumberutils/ (./phonenumberutils/*.jsm)
+  res/autofill/ (./*.sys.mjs)
+  res/autofill/phonenumberutils/ (./phonenumberutils/*.sys.mjs)
   res/autofill/addressmetadata/ (./addressmetadata/*)
   res/autofill/content/ (./content/*)
 #ifdef ANDROID
diff --git a/toolkit/components/formautofill/phonenumberutils/PhoneNumber.sys.mjs b/toolkit/components/formautofill/phonenumberutils/PhoneNumber.sys.mjs
index 8681bb5046c5..369955e096f0 100644
--- a/toolkit/components/formautofill/phonenumberutils/PhoneNumber.sys.mjs
+++ b/toolkit/components/formautofill/phonenumberutils/PhoneNumber.sys.mjs
@@ -5,17 +5,13 @@
 // This library came from https://github.com/andreasgal/PhoneNumber.js but will
 // be further maintained by our own in Form Autofill codebase.
 
-import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
-
-const { PHONE_NUMBER_META_DATA } = ChromeUtils.import(
-  "resource://autofill/phonenumberutils/PhoneNumberMetaData.jsm"
-);
+import { PHONE_NUMBER_META_DATA } from "resource://autofill/phonenumberutils/PhoneNumberMetaData.sys.mjs";
 
 const lazy = {};
 
-XPCOMUtils.defineLazyModuleGetters(lazy, {
+ChromeUtils.defineESModuleGetters(lazy, {
   PhoneNumberNormalizer:
-    "resource://autofill/phonenumberutils/PhoneNumberNormalizer.jsm",
+    "resource://autofill/phonenumberutils/PhoneNumberNormalizer.sys.mjs",
 });
 
 export var PhoneNumber = (function(dataBase) {