diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 8e897403df..65fbf217a9 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -383,7 +383,7 @@ export default class AutofillService implements AutofillServiceInterface {
                 // ref https://developers.google.com/web/fundamentals/design-and-ux/input/forms/
                 if (!fillFields.cardholderName && this.isFieldMatch(f[attr],
                     CreditCardAutoFillConstants.CardHolderFieldNames,
-                    ['cc-name', 'card-name', 'cardholder-name', 'cardholder', 'tbName'])) {
+                    CreditCardAutoFillConstants.CardHolderFieldNameValues)) {
                     fillFields.cardholderName = f;
                     break;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index f474f4e71d..1fdbf69807 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -66,6 +66,14 @@ export class CreditCardAutoFillConstants {
     "nom",
   ];
 
+  static readonly CardHolderFieldNameValues: string[] = [
+    "cc-name",
+    "card-name",
+    "cardholder-name",
+    "cardholder",
+    "tbName",
+  ];
+
   static readonly CardNumberFieldNames: string[] = [
     "cc-number",
     "cc-num",