diff --git a/libs/customer-payment-authorizenet/src/injection-tokens/public_api.ts b/libs/customer-payment-authorizenet/src/injection-tokens/public_api.ts
deleted file mode 100644
index 0cdef1f657..0000000000
--- a/libs/customer-payment-authorizenet/src/injection-tokens/public_api.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER } from './error-matcher.token';
diff --git a/libs/customer-payment-authorizenet/src/public_api.ts b/libs/customer-payment-authorizenet/src/public_api.ts
index 15af1be256..d619072cd6 100644
--- a/libs/customer-payment-authorizenet/src/public_api.ts
+++ b/libs/customer-payment-authorizenet/src/public_api.ts
@@ -1,3 +1,2 @@
 export * from './constants/public_api';
 export * from './models/public_api';
-export * from './injection-tokens/public_api';
diff --git a/libs/customer-payment-authorizenet/src/injection-tokens/error-matcher.token.ts b/libs/customer-payment-authorizenet/state/src/injection-tokens/error-matcher.token.ts
similarity index 66%
rename from libs/customer-payment-authorizenet/src/injection-tokens/error-matcher.token.ts
rename to libs/customer-payment-authorizenet/state/src/injection-tokens/error-matcher.token.ts
index 4008642c5a..bfb06d3a9f 100644
--- a/libs/customer-payment-authorizenet/src/injection-tokens/error-matcher.token.ts
+++ b/libs/customer-payment-authorizenet/state/src/injection-tokens/error-matcher.token.ts
@@ -6,7 +6,7 @@ import { daffTransformErrorToStateError } from '@daffodil/core/state';
  * Transforms `DaffError`s into `DaffStateError`s before they are serialized into state.
  * Can be used to further refine Daffodil errors into more specific app errors.
  */
-export const DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER = new InjectionToken<typeof daffTransformErrorToStateError>(
-  'DAFF_CUSTOMER_PAYMENT_ERROR_MATCHER',
+export const DAFF_CUSTOMER_PAYMENT_AUTHORIZENET_ERROR_MATCHER = new InjectionToken<typeof daffTransformErrorToStateError>(
+  'DAFF_CUSTOMER_PAYMENT_AUTHORIZENET_ERROR_MATCHER',
   { factory: () => daffTransformErrorToStateError },
 );
diff --git a/libs/customer-payment-authorizenet/state/src/injection-tokens/public_api.ts b/libs/customer-payment-authorizenet/state/src/injection-tokens/public_api.ts
new file mode 100644
index 0000000000..bbf4871f54
--- /dev/null
+++ b/libs/customer-payment-authorizenet/state/src/injection-tokens/public_api.ts
@@ -0,0 +1 @@
+export { DAFF_CUSTOMER_PAYMENT_AUTHORIZENET_ERROR_MATCHER } from './error-matcher.token';
diff --git a/libs/customer-payment-authorizenet/state/src/public_api.ts b/libs/customer-payment-authorizenet/state/src/public_api.ts
index f7eec7eb53..70963d55c3 100644
--- a/libs/customer-payment-authorizenet/state/src/public_api.ts
+++ b/libs/customer-payment-authorizenet/state/src/public_api.ts
@@ -1,2 +1,3 @@
+export * from './injection-tokens/public_api';
 export * from './actions/payment.actions';
 export { DaffCustomerPaymentAuthorizeNetPaymentStateModule } from './payment-state.module';