diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index fc925e9cde..a49a06f137 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -387,8 +387,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.cardholderName = f;
                     break;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
-                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no', 'card-no',
-                        'credit-card', 'numero-carte', 'carte', 'carte-credit', 'num-carte', 'cb-num'],
+                    CreditCardAutoFillConstants.CardNumberFieldNames,
                     ['cc-number', 'cc-num', 'card-number', 'card-num', 'cc-no', 'card-no', 'numero-carte',
                         'num-carte', 'cb-num'])) {
                     fillFields.number = f;
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 75d0b5d8a6..7940f2e080 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -59,6 +59,23 @@ export class CreditCardAutoFillConstants {
     "nom",
   ];
 
+  static readonly CardNumberFieldNames: string[] = [
+    "cc-number",
+    "cc-num",
+    "card-number",
+    "card-num",
+    "number",
+    "cc",
+    "cc-no",
+    "card-no",
+    "credit-card",
+    "numero-carte",
+    "carte",
+    "carte-credit",
+    "num-carte",
+    "cb-num",
+  ];
+
   static readonly ExpiryMonthFieldNames: string[] = [
     "exp-month",
     "cc-exp-month",