diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 80a53f80ad..0e59cc8c22 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -631,7 +631,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.address = f;
                     break;
                 } else if (!fillFields.address1 && this.isFieldMatch(f[attr],
-                    ['address-1', 'address-line-1', 'addr-1', 'street-1'])) {
+                    IdentityAutoFillConstants.Address1FieldNames)) {
                     fillFields.address1 = f;
                     break;
                 } else if (!fillFields.address2 && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 7f5428cf9e..995aa0ca37 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -227,6 +227,13 @@ export class IdentityAutoFillConstants {
 
   static readonly EmailFieldNames: string[] = ["e-mail", "email-address"];
 
+  static readonly Address1FieldNames: string[] = [
+    "address-1",
+    "address-line-1",
+    "addr-1",
+    "street-1",
+  ];
+
   static readonly IsoCountries: { [id: string]: string } = {
     afghanistan: "AF",
     "aland islands": "AX",