diff --git a/.changeset/sad-bikes-tan.md b/.changeset/sad-bikes-tan.md
new file mode 100644
index 00000000000..e7d80ebb433
--- /dev/null
+++ b/.changeset/sad-bikes-tan.md
@@ -0,0 +1,8 @@
+---
+'@clerk/localizations': minor
+'@clerk/clerk-js': minor
+'@clerk/types': minor
+---
+
+[Billing Beta] Rename payment sources to method methods.
+Updates localization keys from `commerce` -> `billing` and `paymentSource` to `paymentMethod`.
diff --git a/integration/tests/pricing-table.test.ts b/integration/tests/pricing-table.test.ts
index 70284cf1077..85783fa7977 100644
--- a/integration/tests/pricing-table.test.ts
+++ b/integration/tests/pricing-table.test.ts
@@ -452,7 +452,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
 
   test.describe('in UserProfile', () => {
     // test.describe.configure({ mode: 'serial' });
-    test('renders pricing table, subscribes to a plan, revalidates payment sources on complete and then downgrades to free', async ({
+    test('renders pricing table, subscribes to a plan, revalidates payment method on complete and then downgrades to free', async ({
       page,
       context,
     }) => {
@@ -584,7 +584,7 @@ testAgainstRunningApps({ withEnv: [appConfigs.envs.withBilling] })('pricing tabl
       await fakeUser.deleteIfExists();
     });
 
-    test('adds payment source via checkout and resets stripe setup intent after failed payment', async ({
+    test('adds payment method via checkout and resets stripe setup intent after failed payment', async ({
       page,
       context,
     }) => {
diff --git a/packages/clerk-js/src/core/resources/BillingPaymentSource.ts b/packages/clerk-js/src/core/resources/BillingPaymentMethod.ts
similarity index 100%
rename from packages/clerk-js/src/core/resources/BillingPaymentSource.ts
rename to packages/clerk-js/src/core/resources/BillingPaymentMethod.ts
diff --git a/packages/clerk-js/src/core/resources/internal.ts b/packages/clerk-js/src/core/resources/internal.ts
index 82886d002ac..2c27131bbae 100644
--- a/packages/clerk-js/src/core/resources/internal.ts
+++ b/packages/clerk-js/src/core/resources/internal.ts
@@ -8,7 +8,7 @@ export * from './BillingCheckout';
 export * from './Feature';
 export * from './BillingStatement';
 export * from './BillingPayment';
-export * from './BillingPaymentSource';
+export * from './BillingPaymentMethod';
 export * from './BillingPlan';
 export * from './BillingSubscription';
 export * from './DeletedObject';
diff --git a/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx b/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
index 77fd27f46fa..28eb380ac83 100644
--- a/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/CheckoutComplete.tsx
@@ -330,10 +330,10 @@ export const CheckoutComplete = () => {
               textVariant='h2'
               localizationKey={
                 freeTrialEndsAt
-                  ? localizationKeys('commerce.checkout.title__trialSuccess')
+                  ? localizationKeys('billing.checkout.title__trialSuccess')
                   : totals.totalDueNow.amount > 0
-                    ? localizationKeys('commerce.checkout.title__paymentSuccessful')
-                    : localizationKeys('commerce.checkout.title__subscriptionSuccessful')
+                    ? localizationKeys('billing.checkout.title__paymentSuccessful')
+                    : localizationKeys('billing.checkout.title__subscriptionSuccessful')
               }
               sx={t => ({
                 opacity: 0,
@@ -387,8 +387,8 @@ export const CheckoutComplete = () => {
               })}
               localizationKey={
                 totals.totalDueNow.amount > 0
-                  ? localizationKeys('commerce.checkout.description__paymentSuccessful')
-                  : localizationKeys('commerce.checkout.description__subscriptionSuccessful')
+                  ? localizationKeys('billing.checkout.description__paymentSuccessful')
+                  : localizationKeys('billing.checkout.description__subscriptionSuccessful')
               }
             />
           </Span>
@@ -417,13 +417,13 @@ export const CheckoutComplete = () => {
       >
         <LineItems.Root>
           <LineItems.Group variant='secondary'>
-            <LineItems.Title title={localizationKeys('commerce.checkout.lineItems.title__totalPaid')} />
+            <LineItems.Title title={localizationKeys('billing.checkout.lineItems.title__totalPaid')} />
             <LineItems.Description text={`${totals.totalDueNow.currencySymbol}${totals.totalDueNow.amountFormatted}`} />
           </LineItems.Group>
 
           {freeTrialEndsAt ? (
             <LineItems.Group variant='secondary'>
-              <LineItems.Title title={localizationKeys('commerce.checkout.lineItems.title__freeTrialEndsAt')} />
+              <LineItems.Title title={localizationKeys('billing.checkout.lineItems.title__freeTrialEndsAt')} />
               <LineItems.Description text={formatDate(freeTrialEndsAt)} />
             </LineItems.Group>
           ) : null}
@@ -431,8 +431,8 @@ export const CheckoutComplete = () => {
             <LineItems.Title
               title={
                 totals.totalDueNow.amount > 0 || freeTrialEndsAt !== null
-                  ? localizationKeys('commerce.checkout.lineItems.title__paymentMethod')
-                  : localizationKeys('commerce.checkout.lineItems.title__subscriptionBegins')
+                  ? localizationKeys('billing.checkout.lineItems.title__paymentMethod')
+                  : localizationKeys('billing.checkout.lineItems.title__subscriptionBegins')
               }
             />
             <LineItems.Description
diff --git a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
index a260166293d..acfaf86c7ae 100644
--- a/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/CheckoutForm.tsx
@@ -55,7 +55,7 @@ export const CheckoutForm = withCardStateProvider(() => {
           <LineItems.Group>
             <LineItems.Title
               title={plan.name}
-              description={planPeriod === 'annual' ? localizationKeys('commerce.billedAnnually') : undefined}
+              description={planPeriod === 'annual' ? localizationKeys('billing.billedAnnually') : undefined}
               badge={
                 plan.freeTrialEnabled && freeTrialEndsAt ? (
                   <SubscriptionBadge subscription={{ status: 'free_trial' }} />
@@ -65,19 +65,19 @@ export const CheckoutForm = withCardStateProvider(() => {
             <LineItems.Description
               prefix={planPeriod === 'annual' ? 'x12' : undefined}
               text={`${fee.currencySymbol}${fee.amountFormatted}`}
-              suffix={localizationKeys('commerce.checkout.perMonth')}
+              suffix={localizationKeys('billing.checkout.perMonth')}
             />
           </LineItems.Group>
           <LineItems.Group
             borderTop
             variant='tertiary'
           >
-            <LineItems.Title title={localizationKeys('commerce.subtotal')} />
+            <LineItems.Title title={localizationKeys('billing.subtotal')} />
             <LineItems.Description text={`${totals.subtotal.currencySymbol}${totals.subtotal.amountFormatted}`} />
           </LineItems.Group>
           {showCredits && (
             <LineItems.Group variant='tertiary'>
-              <LineItems.Title title={localizationKeys('commerce.creditRemainder')} />
+              <LineItems.Title title={localizationKeys('billing.creditRemainder')} />
               <LineItems.Description text={`- ${totals.credit?.currencySymbol}${totals.credit?.amountFormatted}`} />
             </LineItems.Group>
           )}
@@ -86,11 +86,11 @@ export const CheckoutForm = withCardStateProvider(() => {
               <Tooltip.Root>
                 <Tooltip.Trigger>
                   <LineItems.Title
-                    title={localizationKeys('commerce.pastDue')}
+                    title={localizationKeys('billing.pastDue')}
                     icon={InformationCircle}
                   />
                 </Tooltip.Trigger>
-                <Tooltip.Content text={localizationKeys('commerce.checkout.pastDueNotice')} />
+                <Tooltip.Content text={localizationKeys('billing.checkout.pastDueNotice')} />
               </Tooltip.Root>
               <LineItems.Description text={`${totals.pastDue?.currencySymbol}${totals.pastDue?.amountFormatted}`} />
             </LineItems.Group>
@@ -99,7 +99,7 @@ export const CheckoutForm = withCardStateProvider(() => {
           {!!freeTrialEndsAt && !!plan.freeTrialDays && (
             <LineItems.Group variant='tertiary'>
               <LineItems.Title
-                title={localizationKeys('commerce.checkout.totalDueAfterTrial', {
+                title={localizationKeys('billing.checkout.totalDueAfterTrial', {
                   days: plan.freeTrialDays,
                 })}
               />
@@ -110,7 +110,7 @@ export const CheckoutForm = withCardStateProvider(() => {
           )}
 
           <LineItems.Group borderTop>
-            <LineItems.Title title={localizationKeys('commerce.totalDueToday')} />
+            <LineItems.Title title={localizationKeys('billing.totalDueToday')} />
             <LineItems.Description text={`${totals.totalDueNow.currencySymbol}${totals.totalDueNow.amountFormatted}`} />
           </LineItems.Group>
         </LineItems.Root>
@@ -125,7 +125,7 @@ export const CheckoutForm = withCardStateProvider(() => {
           })}
         >
           <Text
-            localizationKey={localizationKeys('commerce.checkout.downgradeNotice')}
+            localizationKey={localizationKeys('billing.checkout.downgradeNotice')}
             variant='caption'
             colorScheme='secondary'
           />
@@ -243,11 +243,11 @@ const CheckoutFormElementsInternal = () => {
             >
               <SegmentedControl.Button
                 value='existing'
-                text={localizationKeys('commerce.paymentMethods')}
+                text={localizationKeys('billing.paymentMethods__label')}
               />
               <SegmentedControl.Button
                 value='new'
-                text={localizationKeys('commerce.addPaymentMethod')}
+                text={localizationKeys('billing.addPaymentMethod__label')}
               />
             </SegmentedControl.Root>
           )}
@@ -307,13 +307,13 @@ export const PayWithTestPaymentMethod = () => {
             color: t.colors.$warning500,
             fontWeight: t.fontWeights.$semibold,
           })}
-          localizationKey={localizationKeys('commerce.paymentSource.dev.developmentMode')}
+          localizationKey={localizationKeys('billing.paymentMethod.dev.developmentMode')}
         />
         <Button
           type='button'
           block
           variant='bordered'
-          localizationKey={localizationKeys('userProfile.billingPage.paymentSourcesSection.payWithTestCardButton')}
+          localizationKey={localizationKeys('userProfile.billingPage.paymentMethodsSection.payWithTestCardButton')}
           colorScheme='secondary'
           isLoading={isLoading}
           onClick={payWithTestCard}
@@ -332,16 +332,16 @@ const useSubmitLabel = () => {
   }
 
   if (freeTrialEndsAt) {
-    return localizationKeys('commerce.startFreeTrial');
+    return localizationKeys('billing.startFreeTrial');
   }
 
   if (totals.totalDueNow.amount > 0) {
-    return localizationKeys('commerce.pay', {
+    return localizationKeys('billing.pay', {
       amount: `${totals.totalDueNow.currencySymbol}${totals.totalDueNow.amountFormatted}`,
     });
   }
 
-  return localizationKeys('commerce.subscribe');
+  return localizationKeys('billing.subscribe');
 };
 
 const AddPaymentMethodForCheckout = withCardStateProvider(() => {
diff --git a/packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx b/packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
index 92747208304..ce67f1dbf29 100644
--- a/packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/__tests__/Checkout.test.tsx
@@ -35,7 +35,7 @@ describe('Checkout', () => {
     // Mock billing to prevent actual API calls and stay in loading state
     fixtures.clerk.billing.startCheckout.mockResolvedValue({} as any);
 
-    const { baseElement } = render(
+    const { baseElement, getByRole } = render(
       <Drawer.Root
         open
         onOpenChange={() => {}}
@@ -53,9 +53,7 @@ describe('Checkout', () => {
       expect(baseElement.querySelector('[role="dialog"]')).toBeVisible();
 
       // Verify the checkout title is displayed
-      const title = baseElement.querySelector('[data-localization-key="commerce.checkout.title"]');
-      expect(title).toBeVisible();
-      expect(title).toHaveTextContent('Checkout');
+      expect(getByRole('heading', { name: 'Checkout' })).toBeVisible();
 
       // Verify spinner is shown during initialization
       const spinner = baseElement.querySelector('span[aria-live="polite"]');
@@ -110,7 +108,7 @@ describe('Checkout', () => {
       errors: [{ code: 'unknown_error' }],
     });
 
-    const { baseElement } = render(
+    const { getByRole, baseElement } = render(
       <Drawer.Root
         open
         onOpenChange={() => {}}
@@ -126,7 +124,7 @@ describe('Checkout', () => {
     await waitFor(() => {
       // Component should still render the drawer structure even with errors
       expect(baseElement.querySelector('[role="dialog"]')).toBeVisible();
-      expect(baseElement.querySelector('[data-localization-key="commerce.checkout.title"]')).toBeVisible();
+      expect(getByRole('heading', { name: 'Checkout' })).toBeVisible();
     });
   });
 
@@ -171,7 +169,7 @@ describe('Checkout', () => {
 
     fixtures.clerk.billing.startCheckout.mockResolvedValue({} as any);
 
-    const { baseElement } = render(
+    const { baseElement, getByRole } = render(
       <Drawer.Root
         open
         onOpenChange={() => {}}
@@ -191,7 +189,7 @@ describe('Checkout', () => {
       expect(dialog).toHaveAttribute('tabindex', '-1');
 
       // Check heading hierarchy
-      const heading = baseElement.querySelector('h2[data-localization-key="commerce.checkout.title"]');
+      const heading = getByRole('heading', { name: 'Checkout' });
       expect(heading).toBeVisible();
 
       // Check focus guards for modal
diff --git a/packages/clerk-js/src/ui/components/Checkout/index.tsx b/packages/clerk-js/src/ui/components/Checkout/index.tsx
index 32ffbf6f25f..83ae433d62e 100644
--- a/packages/clerk-js/src/ui/components/Checkout/index.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/index.tsx
@@ -21,7 +21,7 @@ export const Checkout = (props: __internal_CheckoutProps) => {
             }}
           >
             <Drawer.Content>
-              <Drawer.Header title={localizationKeys('commerce.checkout.title')} />
+              <Drawer.Header title={localizationKeys('billing.checkout.title')} />
               <CheckoutPage.Root>
                 <CheckoutPage.Stage name='needs_initialization'>
                   <CheckoutPage.FetchStatus status='fetching'>
diff --git a/packages/clerk-js/src/ui/components/Checkout/parts.tsx b/packages/clerk-js/src/ui/components/Checkout/parts.tsx
index 69ed898f9c5..618710bf8b0 100644
--- a/packages/clerk-js/src/ui/components/Checkout/parts.tsx
+++ b/packages/clerk-js/src/ui/components/Checkout/parts.tsx
@@ -76,12 +76,12 @@ export const InvalidPlanScreen = () => {
             <LineItems.Group>
               <LineItems.Title
                 title={planFromError.name}
-                description={planPeriod === 'annual' ? localizationKeys('commerce.billedAnnually') : undefined}
+                description={planPeriod === 'annual' ? localizationKeys('billing.billedAnnually') : undefined}
               />
               <LineItems.Description
                 prefix={planPeriod === 'annual' ? 'x12' : undefined}
                 text={`${planFromError.currency_symbol}${planPeriod === 'month' ? planFromError.amount_formatted : planFromError.annual_monthly_amount_formatted}`}
-                suffix={localizationKeys('commerce.checkout.perMonth')}
+                suffix={localizationKeys('billing.checkout.perMonth')}
               />
             </LineItems.Group>
           </LineItems.Root>
@@ -92,8 +92,8 @@ export const InvalidPlanScreen = () => {
             colorScheme='info'
             title={
               isPlanUpgradePossible
-                ? localizationKeys('commerce.cannotSubscribeMonthly')
-                : localizationKeys('commerce.cannotSubscribeUnrecoverable')
+                ? localizationKeys('billing.cannotSubscribeMonthly')
+                : localizationKeys('billing.cannotSubscribeUnrecoverable')
             }
           />
         </Box>
@@ -113,8 +113,8 @@ export const AddEmailForm = () => {
         })}
       >
         <EmailForm
-          title={localizationKeys('commerce.checkout.emailForm.title')}
-          subtitle={localizationKeys('commerce.checkout.emailForm.subtitle')}
+          title={localizationKeys('billing.checkout.emailForm.title')}
+          subtitle={localizationKeys('billing.checkout.emailForm.subtitle')}
           onSuccess={() => void checkout.start()}
           onReset={() => setIsOpen(false)}
           disableAutoFocus
diff --git a/packages/clerk-js/src/ui/components/PaymentAttempts/PaymentAttemptPage.tsx b/packages/clerk-js/src/ui/components/PaymentAttempts/PaymentAttemptPage.tsx
index 1987114f6ac..1721aae96f7 100644
--- a/packages/clerk-js/src/ui/components/PaymentAttempts/PaymentAttemptPage.tsx
+++ b/packages/clerk-js/src/ui/components/PaymentAttempts/PaymentAttemptPage.tsx
@@ -175,7 +175,7 @@ export const PaymentAttemptPage = () => {
           >
             <Text
               variant='h3'
-              localizationKey={localizationKeys('commerce.totalDue')}
+              localizationKey={localizationKeys('billing.totalDue')}
               elementDescriptor={descriptors.paymentAttemptFooterLabel}
             />
             <Span
@@ -236,14 +236,14 @@ function PaymentAttemptBody({ subscriptionItem }: { subscriptionItem: BillingSub
           borderTop
           variant='tertiary'
         >
-          <LineItems.Title title={localizationKeys('commerce.subtotal')} />
+          <LineItems.Title title={localizationKeys('billing.subtotal')} />
           <LineItems.Description
             text={`${subscriptionItem.amount?.currencySymbol}${subscriptionItem.amount?.amountFormatted}`}
           />
         </LineItems.Group>
         {subscriptionItem.credit && subscriptionItem.credit.amount.amount > 0 && (
           <LineItems.Group variant='tertiary'>
-            <LineItems.Title title={localizationKeys('commerce.credit')} />
+            <LineItems.Title title={localizationKeys('billing.credit')} />
             <LineItems.Description
               text={`- ${subscriptionItem.credit.amount.currencySymbol}${subscriptionItem.credit.amount.amountFormatted}`}
             />
diff --git a/packages/clerk-js/src/ui/components/PaymentMethods/AddPaymentMethod.tsx b/packages/clerk-js/src/ui/components/PaymentMethods/AddPaymentMethod.tsx
index 362ab76d076..adf8d411432 100644
--- a/packages/clerk-js/src/ui/components/PaymentMethods/AddPaymentMethod.tsx
+++ b/packages/clerk-js/src/ui/components/PaymentMethods/AddPaymentMethod.tsx
@@ -103,8 +103,8 @@ const AddPaymentMethodRoot = ({ children, checkout, ...rest }: PropsWithChildren
         paymentDescription={t(
           localizationKeys(
             checkout?.planPeriod === 'month'
-              ? 'commerce.paymentSource.applePayDescription.monthly'
-              : 'commerce.paymentSource.applePayDescription.annual',
+              ? 'billing.paymentMethod.applePayDescription.monthly'
+              : 'billing.paymentMethod.applePayDescription.annual',
           ),
         )}
       >
@@ -238,7 +238,7 @@ const AddPaymentMethodForm = ({ children }: PropsWithChildren) => {
           isDisabled={!isFormReady}
           submitLabel={
             submitLabel ??
-            localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.formButtonPrimary__add`)
+            localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.formButtonPrimary__add`)
           }
           onReset={cancelAction}
           hideReset={!cancelAction}
diff --git a/packages/clerk-js/src/ui/components/PaymentMethods/PaymentMethods.tsx b/packages/clerk-js/src/ui/components/PaymentMethods/PaymentMethods.tsx
index 2ff4f40836d..476c25b5743 100644
--- a/packages/clerk-js/src/ui/components/PaymentMethods/PaymentMethods.tsx
+++ b/packages/clerk-js/src/ui/components/PaymentMethods/PaymentMethods.tsx
@@ -38,10 +38,10 @@ const AddScreen = withCardStateProvider(({ onSuccess }: { onSuccess: () => void
       cancelAction={close}
     >
       <AddPaymentMethod.FormHeader
-        text={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
+        text={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.add`)}
       />
       <AddPaymentMethod.FormSubtitle
-        text={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.addSubtitle`)}
+        text={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.addSubtitle`)}
       />
       <DevOnly>
         <TestPaymentMethod />
@@ -81,20 +81,18 @@ const RemoveScreen = ({
 
   return (
     <RemoveResourceForm
-      title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.removeResource.title`)}
+      title={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.removeMethod.title`)}
       messageLine1={localizationKeys(
-        `${localizationRoot}.billingPage.paymentSourcesSection.removeResource.messageLine1`,
+        `${localizationRoot}.billingPage.paymentMethodsSection.removeMethod.messageLine1`,
         {
           identifier: ref.current,
         },
       )}
-      messageLine2={localizationKeys(
-        `${localizationRoot}.billingPage.paymentSourcesSection.removeResource.messageLine2`,
-      )}
+      messageLine2={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.removeMethod.messageLine2`)}
       successMessage={localizationKeys(
-        `${localizationRoot}.billingPage.paymentSourcesSection.removeResource.successMessage`,
+        `${localizationRoot}.billingPage.paymentMethodsSection.removeMethod.successMessage`,
         {
-          paymentSource: ref.current,
+          paymentMethod: ref.current,
         },
       )}
       deleteResource={removePaymentMethod}
@@ -127,7 +125,7 @@ export const PaymentMethods = withCardStateProvider(() => {
 
   return (
     <ProfileSection.Root
-      title={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.title`)}
+      title={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.title`)}
       centered={false}
       id='paymentMethods'
       sx={t => ({
@@ -171,7 +169,7 @@ export const PaymentMethods = withCardStateProvider(() => {
                   <Action.Trigger value='add'>
                     <ProfileSection.ArrowButton
                       id='paymentMethods'
-                      localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.add`)}
+                      localizationKey={localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.add`)}
                     />
                   </Action.Trigger>
                   <Action.Open value='add'>
@@ -204,7 +202,7 @@ const PaymentMethodMenu = ({
 
   const actions = [
     {
-      label: localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.actionLabel__remove`),
+      label: localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.actionLabel__remove`),
       isDestructive: true,
       onClick: () => open(`remove-${paymentMethod.id}`),
       isDisabled: !paymentMethod.isRemovable,
@@ -213,7 +211,7 @@ const PaymentMethodMenu = ({
 
   if (!paymentMethod.isDefault) {
     actions.unshift({
-      label: localizationKeys(`${localizationRoot}.billingPage.paymentSourcesSection.actionLabel__default`),
+      label: localizationKeys(`${localizationRoot}.billingPage.paymentMethodsSection.actionLabel__default`),
       isDestructive: false,
       onClick: () => {
         paymentMethod
diff --git a/packages/clerk-js/src/ui/components/PaymentMethods/TestPaymentMethod.tsx b/packages/clerk-js/src/ui/components/PaymentMethods/TestPaymentMethod.tsx
index 6a58e252b27..03bffce85e4 100644
--- a/packages/clerk-js/src/ui/components/PaymentMethods/TestPaymentMethod.tsx
+++ b/packages/clerk-js/src/ui/components/PaymentMethods/TestPaymentMethod.tsx
@@ -38,7 +38,7 @@ export const TestPaymentMethod = () => {
         <Text
           variant='caption'
           colorScheme='body'
-          localizationKey={localizationKeys('commerce.paymentSource.dev.testCardInfo')}
+          localizationKey={localizationKeys('billing.paymentMethod.dev.testCardInfo')}
         />
         <Text
           variant='caption'
@@ -46,21 +46,21 @@ export const TestPaymentMethod = () => {
             color: t.colors.$warning500,
             fontWeight: t.fontWeights.$semibold,
           })}
-          localizationKey={localizationKeys('commerce.paymentSource.dev.developmentMode')}
+          localizationKey={localizationKeys('billing.paymentMethod.dev.developmentMode')}
         />
       </Box>
       <LineItems.Root>
         <LineItems.Group variant='tertiary'>
-          <LineItems.Title title={localizationKeys('commerce.paymentSource.dev.cardNumber')} />
+          <LineItems.Title title={localizationKeys('billing.paymentMethod.dev.cardNumber')} />
           <LineItems.Description text={'4242 4242 4242 4242'} />
         </LineItems.Group>
         <LineItems.Group variant='tertiary'>
-          <LineItems.Title title={localizationKeys('commerce.paymentSource.dev.expirationDate')} />
+          <LineItems.Title title={localizationKeys('billing.paymentMethod.dev.expirationDate')} />
           <LineItems.Description text={'11/44'} />
         </LineItems.Group>
         <LineItems.Group variant='tertiary'>
-          <LineItems.Title title={localizationKeys('commerce.paymentSource.dev.cvcZip')} />
-          <LineItems.Description text={t(localizationKeys('commerce.paymentSource.dev.anyNumbers'))} />
+          <LineItems.Title title={localizationKeys('billing.paymentMethod.dev.cvcZip')} />
+          <LineItems.Description text={t(localizationKeys('billing.paymentMethod.dev.anyNumbers'))} />
         </LineItems.Group>
       </LineItems.Root>
     </Box>
diff --git a/packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx b/packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
index 18005f87926..38476c74849 100644
--- a/packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
+++ b/packages/clerk-js/src/ui/components/Plans/PlanDetails.tsx
@@ -143,7 +143,7 @@ const PlanDetailsInternal = ({
           <Text
             elementDescriptor={descriptors.planDetailCaption}
             variant={'caption'}
-            localizationKey={localizationKeys('commerce.availableFeatures')}
+            localizationKey={localizationKeys('billing.availableFeatures')}
             colorScheme='secondary'
             sx={t => ({
               padding: t.space.$4,
@@ -328,7 +328,7 @@ const Header = React.forwardRef<HTMLDivElement, HeaderProps>((props, ref) => {
                 marginInlineEnd: t.space.$1,
               },
             })}
-            localizationKey={localizationKeys('commerce.month')}
+            localizationKey={localizationKeys('billing.month')}
           />
         </>
       </Flex>
@@ -344,7 +344,7 @@ const Header = React.forwardRef<HTMLDivElement, HeaderProps>((props, ref) => {
           <Switch
             isChecked={planPeriod === 'annual'}
             onChange={(checked: boolean) => setPlanPeriod(checked ? 'annual' : 'month')}
-            label={localizationKeys('commerce.billedAnnually')}
+            label={localizationKeys('billing.billedAnnually')}
           />
         </Box>
       ) : (
@@ -353,7 +353,7 @@ const Header = React.forwardRef<HTMLDivElement, HeaderProps>((props, ref) => {
           variant='caption'
           colorScheme='secondary'
           localizationKey={
-            plan.isDefault ? localizationKeys('commerce.alwaysFree') : localizationKeys('commerce.billedMonthlyOnly')
+            plan.isDefault ? localizationKeys('billing.alwaysFree') : localizationKeys('billing.billedMonthlyOnly')
           }
           sx={t => ({
             justifySelf: 'flex-start',
diff --git a/packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx b/packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx
index 08ff6ee7c6f..1d71da6bbca 100644
--- a/packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx
+++ b/packages/clerk-js/src/ui/components/PricingTable/PricingTable.tsx
@@ -68,7 +68,7 @@ const PricingTableRoot = (props: PricingTableProps) => {
     return;
   };
 
-  // Pre-fetch payment sources
+  // Pre-fetch payment methods
   usePaymentMethods();
 
   return (
diff --git a/packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx b/packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx
index 8c34bcd7af9..e7991782629 100644
--- a/packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx
+++ b/packages/clerk-js/src/ui/components/PricingTable/PricingTableDefault.tsx
@@ -371,7 +371,7 @@ const CardHeader = React.forwardRef<HTMLDivElement, CardHeaderProps>((props, ref
                 marginInlineEnd: t.space.$0x25,
               },
             })}
-            localizationKey={localizationKeys('commerce.month')}
+            localizationKey={localizationKeys('billing.month')}
           />
         ) : null}
       </Flex>
@@ -386,7 +386,7 @@ const CardHeader = React.forwardRef<HTMLDivElement, CardHeaderProps>((props, ref
           <Switch
             isChecked={planPeriod === 'annual'}
             onChange={(checked: boolean) => setPlanPeriod(checked ? 'annual' : 'month')}
-            label={localizationKeys('commerce.billedAnnually')}
+            label={localizationKeys('billing.billedAnnually')}
           />
         </Box>
       ) : (
@@ -395,7 +395,7 @@ const CardHeader = React.forwardRef<HTMLDivElement, CardHeaderProps>((props, ref
           variant='caption'
           colorScheme='secondary'
           localizationKey={
-            plan.isDefault ? localizationKeys('commerce.alwaysFree') : localizationKeys('commerce.billedMonthlyOnly')
+            plan.isDefault ? localizationKeys('billing.alwaysFree') : localizationKeys('billing.billedMonthlyOnly')
           }
           sx={t => ({
             justifySelf: 'flex-start',
@@ -502,7 +502,7 @@ const CardFeaturesList = React.forwardRef<HTMLDivElement, CardFeaturesListProps>
             size='md'
             aria-hidden
           />
-          <Span localizationKey={localizationKeys('commerce.seeAllFeatures')} />
+          <Span localizationKey={localizationKeys('billing.seeAllFeatures')} />
         </SimpleButton>
       )}
     </Box>
diff --git a/packages/clerk-js/src/ui/components/PricingTable/PricingTableMatrix.tsx b/packages/clerk-js/src/ui/components/PricingTable/PricingTableMatrix.tsx
index c0c7ff2cc7e..0ec8b725f05 100644
--- a/packages/clerk-js/src/ui/components/PricingTable/PricingTableMatrix.tsx
+++ b/packages/clerk-js/src/ui/components/PricingTable/PricingTableMatrix.tsx
@@ -133,7 +133,7 @@ export function PricingTableMatrix({
                       id={segmentedControlId}
                       colorScheme='secondary'
                       variant='caption'
-                      localizationKey={localizationKeys('commerce.pricingTable.billingCycle')}
+                      localizationKey={localizationKeys('billing.pricingTable.billingCycle')}
                     >
                       Billing cycle
                     </Text>
@@ -144,11 +144,11 @@ export function PricingTableMatrix({
                     >
                       <SegmentedControl.Button
                         value='month'
-                        text={localizationKeys('commerce.monthly')}
+                        text={localizationKeys('billing.monthly')}
                       />
                       <SegmentedControl.Button
                         value='annual'
-                        text={localizationKeys('commerce.annually')}
+                        text={localizationKeys('billing.annually')}
                       />
                     </SegmentedControl.Root>
                   </>
@@ -211,7 +211,7 @@ export function PricingTableMatrix({
                             <Badge
                               elementDescriptor={descriptors.pricingTableMatrixBadge}
                               colorScheme='secondary'
-                              localizationKey={localizationKeys('commerce.popular')}
+                              localizationKey={localizationKeys('billing.popular')}
                             />
                           ) : null}
                         </Span>
@@ -251,7 +251,7 @@ export function PricingTableMatrix({
                                   marginInlineEnd: t.space.$1,
                                 },
                               })}
-                              localizationKey={localizationKeys('commerce.month')}
+                              localizationKey={localizationKeys('billing.month')}
                             />
                             {plan.annualMonthlyFee.amount > 0 ? (
                               <Box
@@ -291,7 +291,7 @@ export function PricingTableMatrix({
                                       size='sm'
                                       aria-hidden
                                     />{' '}
-                                    <Span localizationKey={localizationKeys('commerce.billedAnnually')} />
+                                    <Span localizationKey={localizationKeys('billing.billedAnnually')} />
                                   </Text>
                                 </Box>
                               </Box>
@@ -301,7 +301,7 @@ export function PricingTableMatrix({
                           <Text
                             elementDescriptor={descriptors.pricingTableMatrixFee}
                             variant='h2'
-                            localizationKey={localizationKeys('commerce.free')}
+                            localizationKey={localizationKeys('billing.free')}
                             colorScheme='body'
                           />
                         )}
@@ -398,7 +398,7 @@ export function PricingTableMatrix({
                             icon={Check}
                             colorScheme='neutral'
                             size='sm'
-                            aria-label={t(localizationKeys('commerce.pricingTable.included'))}
+                            aria-label={t(localizationKeys('billing.pricingTable.included'))}
                           />
                         )}
                       </Box>
diff --git a/packages/clerk-js/src/ui/components/Statements/StatementPage.tsx b/packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
index 6a0e7d1dd40..6c64b7d861b 100644
--- a/packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
+++ b/packages/clerk-js/src/ui/components/Statements/StatementPage.tsx
@@ -106,7 +106,7 @@ export const StatementPage = () => {
                     <Statement.SectionContentItem key={item.id}>
                       <Statement.SectionContentDetailsHeader
                         title={item.subscriptionItem.plan.name}
-                        description={`${item.subscriptionItem.amount?.currencySymbol}${item.subscriptionItem.amount?.amountFormatted} / ${item.subscriptionItem.planPeriod === 'month' ? t(localizationKeys('commerce.month')) : t(localizationKeys('commerce.year'))}`}
+                        description={`${item.subscriptionItem.amount?.currencySymbol}${item.subscriptionItem.amount?.amountFormatted} / ${item.subscriptionItem.planPeriod === 'month' ? t(localizationKeys('billing.month')) : t(localizationKeys('billing.year'))}`}
                         secondaryTitle={`${item.amount.currencySymbol}${item.amount.amountFormatted}`}
                       />
                       <Statement.SectionContentDetailsList>
@@ -139,7 +139,7 @@ export const StatementPage = () => {
                                 gap: t.space.$1,
                               })}
                             >
-                              <Span localizationKey={localizationKeys('commerce.viewPayment')} />
+                              <Span localizationKey={localizationKeys('billing.viewPayment')} />
                               <Icon
                                 icon={ArrowRightIcon}
                                 size='sm'
diff --git a/packages/clerk-js/src/ui/components/SubscriptionDetails/index.tsx b/packages/clerk-js/src/ui/components/SubscriptionDetails/index.tsx
index 8359687104a..a8828713205 100644
--- a/packages/clerk-js/src/ui/components/SubscriptionDetails/index.tsx
+++ b/packages/clerk-js/src/ui/components/SubscriptionDetails/index.tsx
@@ -144,7 +144,7 @@ const SubscriptionDetailsInternal = (props: __internal_SubscriptionDetailsProps)
         setConfirmationOpen,
       }}
     >
-      <Drawer.Header title={localizationKeys('commerce.subscriptionDetails.title')} />
+      <Drawer.Header title={localizationKeys('billing.subscriptionDetails.title')} />
 
       <Drawer.Body
         sx={t => ({
@@ -245,8 +245,8 @@ const SubscriptionDetailsFooter = withCardStateProvider(() => {
                 }}
                 localizationKey={
                   selectedSubscription?.isFreeTrial
-                    ? localizationKeys('commerce.keepFreeTrial')
-                    : localizationKeys('commerce.keepSubscription')
+                    ? localizationKeys('billing.keepFreeTrial')
+                    : localizationKeys('billing.keepSubscription')
                 }
               />
             )}
@@ -259,10 +259,10 @@ const SubscriptionDetailsFooter = withCardStateProvider(() => {
               onClick={() => void cancelSubscription()}
               localizationKey={
                 selectedSubscription?.isFreeTrial
-                  ? localizationKeys('commerce.cancelFreeTrial', {
+                  ? localizationKeys('billing.cancelFreeTrial', {
                       plan: selectedSubscription.plan.name,
                     })
-                  : localizationKeys('commerce.cancelSubscription')
+                  : localizationKeys('billing.cancelSubscription')
               }
             />
           </>
@@ -276,10 +276,10 @@ const SubscriptionDetailsFooter = withCardStateProvider(() => {
               textVariant='h3'
               localizationKey={
                 selectedSubscription?.isFreeTrial
-                  ? localizationKeys('commerce.cancelFreeTrialTitle', {
+                  ? localizationKeys('billing.cancelFreeTrialTitle', {
                       plan: selectedSubscription.plan.name,
                     })
-                  : localizationKeys('commerce.cancelSubscriptionTitle', {
+                  : localizationKeys('billing.cancelSubscriptionTitle', {
                       plan: `${selectedSubscription.status === 'upcoming' ? 'upcoming ' : ''}${selectedSubscription.plan.name}`,
                     })
               }
@@ -289,15 +289,15 @@ const SubscriptionDetailsFooter = withCardStateProvider(() => {
               colorScheme='secondary'
               localizationKey={
                 selectedSubscription?.isFreeTrial
-                  ? localizationKeys('commerce.cancelFreeTrialAccessUntil', {
+                  ? localizationKeys('billing.cancelFreeTrialAccessUntil', {
                       plan: selectedSubscription.plan.name,
                       date: selectedSubscription.periodEnd as Date,
                     })
                   : selectedSubscription.status === 'upcoming'
-                    ? localizationKeys('commerce.cancelSubscriptionNoCharge')
+                    ? localizationKeys('billing.cancelSubscriptionNoCharge')
                     : selectedSubscription.status === 'past_due'
-                      ? localizationKeys('commerce.cancelSubscriptionPastDue')
-                      : localizationKeys('commerce.cancelSubscriptionAccessUntil', {
+                      ? localizationKeys('billing.cancelSubscriptionPastDue')
+                      : localizationKeys('billing.cancelSubscriptionAccessUntil', {
                           plan: selectedSubscription.plan.name,
                           // this will always be defined in this state
                           date: selectedSubscription.periodEnd as Date,
@@ -331,19 +331,19 @@ function SubscriptionDetailsSummary() {
   return (
     <LineItems.Root>
       <LineItems.Group>
-        <LineItems.Title description={localizationKeys('commerce.subscriptionDetails.currentBillingCycle')} />
+        <LineItems.Title description={localizationKeys('billing.subscriptionDetails.currentBillingCycle')} />
         <LineItems.Description
           text={
             activeSubscription.planPeriod === 'month'
-              ? localizationKeys('commerce.monthly')
-              : localizationKeys('commerce.annually')
+              ? localizationKeys('billing.monthly')
+              : localizationKeys('billing.annually')
           }
         />
       </LineItems.Group>
       <LineItems.Group>
         <LineItems.Title
           description={localizationKeys(
-            `commerce.subscriptionDetails.${isFreeTrial ? 'firstPaymentOn' : 'nextPaymentOn'}`,
+            `billing.subscriptionDetails.${isFreeTrial ? 'firstPaymentOn' : 'nextPaymentOn'}`,
           )}
         />
         <LineItems.Description text={formatDate(subscription.nextPayment.date)} />
@@ -351,7 +351,7 @@ function SubscriptionDetailsSummary() {
       <LineItems.Group>
         <LineItems.Title
           description={localizationKeys(
-            `commerce.subscriptionDetails.${isFreeTrial ? 'firstPaymentAmount' : 'nextPaymentAmount'}`,
+            `billing.subscriptionDetails.${isFreeTrial ? 'firstPaymentAmount' : 'nextPaymentAmount'}`,
           )}
         />
         <LineItems.Description
@@ -408,11 +408,11 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
         ? {
             label:
               subscription.planPeriod === 'month'
-                ? localizationKeys('commerce.switchToAnnualWithAnnualPrice', {
+                ? localizationKeys('billing.switchToAnnualWithAnnualPrice', {
                     price: normalizeFormatted(subscription.plan.annualFee.amountFormatted),
                     currency: subscription.plan.annualFee.currencySymbol,
                   })
-                : localizationKeys('commerce.switchToMonthlyWithPrice', {
+                : localizationKeys('billing.switchToMonthlyWithPrice', {
                     price: normalizeFormatted(subscription.plan.fee.amountFormatted),
                     currency: subscription.plan.fee.currencySymbol,
                   }),
@@ -429,10 +429,10 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
         ? {
             isDestructive: true,
             label: subscription.isFreeTrial
-              ? localizationKeys('commerce.cancelFreeTrial', {
+              ? localizationKeys('billing.cancelFreeTrial', {
                   plan: subscription.plan.name,
                 })
-              : localizationKeys('commerce.cancelSubscription'),
+              : localizationKeys('billing.cancelSubscription'),
             onClick: () => {
               setSubscription(subscription);
               setConfirmationOpen(true);
@@ -441,7 +441,7 @@ const SubscriptionCardActions = ({ subscription }: { subscription: BillingSubscr
         : null,
       isReSubscribable
         ? {
-            label: localizationKeys('commerce.reSubscribe'),
+            label: localizationKeys('billing.reSubscribe'),
             onClick: () => {
               openCheckout({
                 planId: subscription.plan.id,
@@ -547,7 +547,7 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
           >
             {fee.currencySymbol}
             {fee.amountFormatted} /{' '}
-            {t(localizationKeys(`commerce.${subscription.planPeriod === 'month' ? 'month' : 'year'}`))}
+            {t(localizationKeys(`billing.${subscription.planPeriod === 'month' ? 'month' : 'year'}`))}
           </Text>
 
           <SubscriptionCardActions subscription={subscription} />
@@ -556,7 +556,7 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
 
       {subscription.pastDueAt ? (
         <DetailRow
-          label={localizationKeys('commerce.subscriptionDetails.pastDueAt')}
+          label={localizationKeys('billing.subscriptionDetails.pastDueAt')}
           value={formatDate(subscription.pastDueAt)}
         />
       ) : null}
@@ -566,8 +566,8 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
           <DetailRow
             label={
               subscription.isFreeTrial
-                ? localizationKeys('commerce.subscriptionDetails.trialStartedOn')
-                : localizationKeys('commerce.subscriptionDetails.subscribedOn')
+                ? localizationKeys('billing.subscriptionDetails.trialStartedOn')
+                : localizationKeys('billing.subscriptionDetails.subscribedOn')
             }
             value={formatDate(subscription.createdAt)}
           />
@@ -576,10 +576,10 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
             <DetailRow
               label={
                 subscription.canceledAt
-                  ? localizationKeys('commerce.subscriptionDetails.endsOn')
+                  ? localizationKeys('billing.subscriptionDetails.endsOn')
                   : subscription.isFreeTrial
-                    ? localizationKeys('commerce.subscriptionDetails.trialEndsOn')
-                    : localizationKeys('commerce.subscriptionDetails.renewsAt')
+                    ? localizationKeys('billing.subscriptionDetails.trialEndsOn')
+                    : localizationKeys('billing.subscriptionDetails.renewsAt')
               }
               value={formatDate(subscription.periodEnd)}
             />
@@ -589,7 +589,7 @@ const SubscriptionCard = ({ subscription }: { subscription: BillingSubscriptionI
 
       {subscription.status === 'upcoming' ? (
         <DetailRow
-          label={localizationKeys('commerce.subscriptionDetails.beginsOn')}
+          label={localizationKeys('billing.subscriptionDetails.beginsOn')}
           value={formatDate(subscription.periodStart)}
         />
       ) : null}
diff --git a/packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx b/packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx
index 4ecd5bc38b2..92def451c1b 100644
--- a/packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx
+++ b/packages/clerk-js/src/ui/components/Subscriptions/SubscriptionsList.tsx
@@ -216,8 +216,8 @@ function SubscriptionRow({ subscription, length }: { subscription: BillingSubscr
               })}
               localizationKey={
                 subscription.planPeriod === 'annual'
-                  ? localizationKeys('commerce.year')
-                  : localizationKeys('commerce.month')
+                  ? localizationKeys('billing.year')
+                  : localizationKeys('billing.month')
               }
             />
           )}
diff --git a/packages/clerk-js/src/ui/contexts/components/Plans.tsx b/packages/clerk-js/src/ui/contexts/components/Plans.tsx
index d39d173ba34..f76d0d7e0fb 100644
--- a/packages/clerk-js/src/ui/contexts/components/Plans.tsx
+++ b/packages/clerk-js/src/ui/contexts/components/Plans.tsx
@@ -226,7 +226,7 @@ export const usePlansContext = () => {
           const isEligibleForTrial = topLevelSubscription?.eligibleForFreeTrial;
 
           if (isSignedOut || isEligibleForTrial) {
-            return localizationKeys('commerce.startFreeTrial__days', { days: plan.freeTrialDays ?? 0 });
+            return localizationKeys('billing.startFreeTrial__days', { days: plan.freeTrialDays ?? 0 });
           }
         }
         return localizationKey;
@@ -237,31 +237,31 @@ export const usePlansContext = () => {
         if (subscription) {
           if (_selectedPlanPeriod !== subscription.planPeriod && subscription.canceledAt) {
             if (_selectedPlanPeriod === 'month') {
-              return localizationKeys('commerce.switchToMonthly');
+              return localizationKeys('billing.switchToMonthly');
             }
 
             if (isEligibleForSwitchToAnnual) {
-              return localizationKeys('commerce.switchToAnnual');
+              return localizationKeys('billing.switchToAnnual');
             }
           }
 
           if (subscription.canceledAt) {
-            return localizationKeys('commerce.reSubscribe');
+            return localizationKeys('billing.reSubscribe');
           }
 
           if (_selectedPlanPeriod !== subscription.planPeriod) {
             if (_selectedPlanPeriod === 'month') {
-              return localizationKeys('commerce.switchToMonthly');
+              return localizationKeys('billing.switchToMonthly');
             }
 
             if (isEligibleForSwitchToAnnual) {
-              return localizationKeys('commerce.switchToAnnual');
+              return localizationKeys('billing.switchToAnnual');
             }
 
-            return localizationKeys('commerce.manageSubscription');
+            return localizationKeys('billing.manageSubscription');
           }
 
-          return localizationKeys('commerce.manageSubscription');
+          return localizationKeys('billing.manageSubscription');
         }
 
         // Handle non-subscription cases
@@ -269,8 +269,8 @@ export const usePlansContext = () => {
           subscriptionItems.filter(subscription => !subscription.plan.isDefault).length > 0;
 
         return hasNonDefaultSubscriptions
-          ? localizationKeys('commerce.switchPlan')
-          : freeTrialOr(localizationKeys('commerce.subscribe'));
+          ? localizationKeys('billing.switchPlan')
+          : freeTrialOr(localizationKeys('billing.subscribe'));
       };
 
       return {
diff --git a/packages/localizations/src/ar-SA.ts b/packages/localizations/src/ar-SA.ts
index ae4c923509c..ccfa6624bd1 100644
--- a/packages/localizations/src/ar-SA.ts
+++ b/packages/localizations/src/ar-SA.ts
@@ -68,8 +68,8 @@ export const arSA: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'جهاز المستخدم',
   badge__you: 'أنت',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const arSA: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const arSA: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const arSA: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -961,7 +961,7 @@ export const arSA: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -970,7 +970,7 @@ export const arSA: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/be-BY.ts b/packages/localizations/src/be-BY.ts
index 0aab8499db2..6ad89d0a1dd 100644
--- a/packages/localizations/src/be-BY.ts
+++ b/packages/localizations/src/be-BY.ts
@@ -68,8 +68,8 @@ export const beBY: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Карыстальніцкая прылада',
   badge__you: 'Вы',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const beBY: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -284,7 +284,7 @@ export const beBY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -293,7 +293,7 @@ export const beBY: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -970,7 +970,7 @@ export const beBY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -979,7 +979,7 @@ export const beBY: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/bg-BG.ts b/packages/localizations/src/bg-BG.ts
index 3debafebd0d..62cd716d4f2 100644
--- a/packages/localizations/src/bg-BG.ts
+++ b/packages/localizations/src/bg-BG.ts
@@ -68,8 +68,8 @@ export const bgBG: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Потребителско устройство',
   badge__you: 'Вие',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -122,8 +122,8 @@ export const bgBG: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const bgBG: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const bgBG: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -962,7 +962,7 @@ export const bgBG: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -971,7 +971,7 @@ export const bgBG: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/bn-IN.ts b/packages/localizations/src/bn-IN.ts
index a31bdfcf4c2..0bb72c871f9 100644
--- a/packages/localizations/src/bn-IN.ts
+++ b/packages/localizations/src/bn-IN.ts
@@ -68,8 +68,8 @@ export const bnIN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'ব্যবহারকারীর ডিভাইস',
   badge__you: 'আপনি',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const bnIN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const bnIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'ডিফল্ট করুন',
         actionLabel__remove: 'সরান',
         add: 'নতুন পেমেন্ট উৎস যোগ করুন',
@@ -292,11 +292,11 @@ export const bnIN: LocalizationResource = {
         formButtonPrimary__add: 'পেমেন্ট পদ্ধতি যোগ করুন',
         formButtonPrimary__pay: '{{amount}} প্রদান করুন',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} এই অ্যাকাউন্ট থেকে সরানো হবে।',
           messageLine2:
             'আপনি আর এই পেমেন্ট উৎস ব্যবহার করতে পারবেন না এবং এর উপর নির্ভরশীল যেকোনো আবর্তক সাবস্ক্রিপশন আর কাজ করবে না।',
-          successMessage: '{{paymentSource}} আপনার অ্যাকাউন্ট থেকে সরানো হয়েছে।',
+          successMessage: '{{paymentMethod}} আপনার অ্যাকাউন্ট থেকে সরানো হয়েছে।',
           title: 'পেমেন্ট উৎস সরান',
         },
         title: 'উপলব্ধ বিকল্প',
@@ -973,7 +973,7 @@ export const bnIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -982,7 +982,7 @@ export const bnIN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/ca-ES.ts b/packages/localizations/src/ca-ES.ts
index 33e5ca2bc72..1d15c1baf59 100644
--- a/packages/localizations/src/ca-ES.ts
+++ b/packages/localizations/src/ca-ES.ts
@@ -68,8 +68,8 @@ export const caES: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: "Dispositiu de l'usuari",
   badge__you: 'Tu',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -122,8 +122,8 @@ export const caES: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const caES: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const caES: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -965,7 +965,7 @@ export const caES: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -974,7 +974,7 @@ export const caES: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/cs-CZ.ts b/packages/localizations/src/cs-CZ.ts
index 60ebed8d8bf..1ba18916cfe 100644
--- a/packages/localizations/src/cs-CZ.ts
+++ b/packages/localizations/src/cs-CZ.ts
@@ -69,8 +69,8 @@ export const csCZ: LocalizationResource = {
   badge__upcomingPlan: 'Nadcházející',
   badge__userDevice: 'Zařízení uživatele',
   badge__you: 'Vy',
-  commerce: {
-    addPaymentMethod: 'Přidat platební metodu',
+  billing: {
+    addPaymentMethod__label: 'Přidat platební metodu',
     alwaysFree: 'Vždy zdarma',
     annually: 'Ročně',
     availableFeatures: 'Dostupné funkce',
@@ -125,8 +125,8 @@ export const csCZ: LocalizationResource = {
     monthly: 'Měsíčně',
     pastDue: 'Po splatnosti',
     pay: 'Zaplatit {{amount}}',
-    paymentMethods: 'Platební metody',
-    paymentSource: {
+    paymentMethods__label: 'Platební metody',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Roční platba',
         monthly: 'Měsíční platba',
@@ -287,7 +287,7 @@ export const csCZ: LocalizationResource = {
         tableHeader__date: 'Datum',
         tableHeader__status: 'Stav',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Nastavit jako výchozí',
         actionLabel__remove: 'Odebrat',
         add: 'Přidat novou platební metodu',
@@ -296,11 +296,11 @@ export const csCZ: LocalizationResource = {
         formButtonPrimary__add: 'Přidat platební metodu',
         formButtonPrimary__pay: 'Zaplatit {{amount}}',
         payWithTestCardButton: 'Zaplatit testovací kartou',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} bude odstraněn z tohoto účtu.',
           messageLine2:
             'Tento platební zdroj již nebudete moci používat a veškerá opakující se předplatná, která na něm závisí, přestanou fungovat.',
-          successMessage: '{{paymentSource}} byl odstraněn z vašeho účtu.',
+          successMessage: '{{paymentMethod}} byl odstraněn z vašeho účtu.',
           title: 'Odebrat platební metodu',
         },
         title: 'Platební metody',
@@ -974,7 +974,7 @@ export const csCZ: LocalizationResource = {
         tableHeader__date: 'Datum',
         tableHeader__status: 'Stav',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Nastavit jako výchozí',
         actionLabel__remove: 'Odebrat',
         add: 'Přidat novou platební metodu',
@@ -983,11 +983,11 @@ export const csCZ: LocalizationResource = {
         formButtonPrimary__add: 'Přidat platební metodu',
         formButtonPrimary__pay: 'Zaplatit {{amount}}',
         payWithTestCardButton: 'Zaplatit testovací kartou',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} bude odstraněn z tohoto účtu.',
           messageLine2:
             'Tento platební zdroj již nebudete moci používat a veškerá opakující se předplatná, která na něm závisí, přestanou fungovat.',
-          successMessage: '{{paymentSource}} byl odstraněn z vašeho účtu.',
+          successMessage: '{{paymentMethod}} byl odstraněn z vašeho účtu.',
           title: 'Odebrat platební metodu',
         },
         title: 'Platební metody',
diff --git a/packages/localizations/src/da-DK.ts b/packages/localizations/src/da-DK.ts
index 79a7f601eae..5a99bcbda28 100644
--- a/packages/localizations/src/da-DK.ts
+++ b/packages/localizations/src/da-DK.ts
@@ -68,8 +68,8 @@ export const daDK: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Brugerenhed',
   badge__you: 'Dig',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const daDK: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const daDK: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const daDK: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -961,7 +961,7 @@ export const daDK: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -970,7 +970,7 @@ export const daDK: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/de-DE.ts b/packages/localizations/src/de-DE.ts
index fec69ce9f6d..52972eddfcc 100644
--- a/packages/localizations/src/de-DE.ts
+++ b/packages/localizations/src/de-DE.ts
@@ -69,8 +69,8 @@ export const deDE: LocalizationResource = {
   badge__upcomingPlan: 'Bevorstehend',
   badge__userDevice: 'Benutzergerät',
   badge__you: 'Du',
-  commerce: {
-    addPaymentMethod: 'Zahlungsmethode hinzufügen',
+  billing: {
+    addPaymentMethod__label: 'Zahlungsmethode hinzufügen',
     alwaysFree: 'Immer kostenlos',
     annually: 'Jährlich',
     availableFeatures: 'Verfügbare Funktionen',
@@ -127,8 +127,8 @@ export const deDE: LocalizationResource = {
     monthly: 'Monatlich',
     pastDue: 'Überfällig',
     pay: '{{amount}} bezahlen',
-    paymentMethods: 'Zahlungsmethoden',
-    paymentSource: {
+    paymentMethods__label: 'Zahlungsmethoden',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Jährlich abgerechnet',
         monthly: 'Monatlich abgerechnet',
@@ -291,7 +291,7 @@ export const deDE: LocalizationResource = {
         tableHeader__date: 'Datum',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Als Standard festlegen',
         actionLabel__remove: 'Entfernen',
         add: 'Neue Zahlungsmethode hinzufügen',
@@ -300,11 +300,11 @@ export const deDE: LocalizationResource = {
         formButtonPrimary__add: 'Zahlungsmethode hinzufügen',
         formButtonPrimary__pay: '{{amount}} bezahlen',
         payWithTestCardButton: 'Mit Test-Kreditkarte bezahlen',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} wird von diesem Konto entfernt.',
           messageLine2:
             'In Zukunft können Sie diese Zahlungsmethode nicht mehr verwenden. Alle laufenden Abonnements, die diese Zahlungsmethode verwenden, werden aufhören zu funktionieren.',
-          successMessage: '{{paymentSource}} wurde von diesem Konto entfernt.',
+          successMessage: '{{paymentMethod}} wurde von diesem Konto entfernt.',
           title: 'Zahlungsmethode entfernen',
         },
         title: 'Zahlungsmethoden',
@@ -990,7 +990,7 @@ export const deDE: LocalizationResource = {
         tableHeader__date: 'Datum',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Als Standard festlegen',
         actionLabel__remove: 'Entfernen',
         add: 'Neue Zahlungsmethode hinzufügen',
@@ -999,11 +999,11 @@ export const deDE: LocalizationResource = {
         formButtonPrimary__add: 'Zahlungsmethode hinzufügen',
         formButtonPrimary__pay: '{{amount}} bezahlen',
         payWithTestCardButton: 'Mit Test-Kreditkarte bezahlen',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} wird von diesem Konto entfernt.',
           messageLine2:
             'In Zukunft können Sie diese Zahlungsmethode nicht mehr verwenden. Alle laufenden Abonnements, die diese Zahlungsmethode verwenden, werden aufhören zu funktionieren.',
-          successMessage: '{{paymentSource}} wurde von diesem Konto entfernt.',
+          successMessage: '{{paymentMethod}} wurde von diesem Konto entfernt.',
           title: 'Zahlungsmethode entfernen',
         },
         title: 'Zahlungsmethoden',
diff --git a/packages/localizations/src/el-GR.ts b/packages/localizations/src/el-GR.ts
index aca16802156..717a5b712a3 100644
--- a/packages/localizations/src/el-GR.ts
+++ b/packages/localizations/src/el-GR.ts
@@ -68,8 +68,8 @@ export const elGR: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Συσκευή χρήστη',
   badge__you: 'Εσείς',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const elGR: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const elGR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const elGR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -969,7 +969,7 @@ export const elGR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -978,7 +978,7 @@ export const elGR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/en-GB.ts b/packages/localizations/src/en-GB.ts
index 9f445437d86..4fb6ffd1e85 100644
--- a/packages/localizations/src/en-GB.ts
+++ b/packages/localizations/src/en-GB.ts
@@ -68,8 +68,8 @@ export const enGB: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'User device',
   badge__you: 'You',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const enGB: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const enGB: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const enGB: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -969,7 +969,7 @@ export const enGB: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -978,7 +978,7 @@ export const enGB: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/en-US.ts b/packages/localizations/src/en-US.ts
index 4b7089a8f7a..a16ecd25e7e 100644
--- a/packages/localizations/src/en-US.ts
+++ b/packages/localizations/src/en-US.ts
@@ -57,8 +57,7 @@ export const enUS: LocalizationResource = {
   badge__upcomingPlan: 'Upcoming',
   badge__userDevice: 'User device',
   badge__you: 'You',
-  commerce: {
-    addPaymentMethod: 'Add payment method',
+  billing: {
     alwaysFree: 'Always free',
     annually: 'Annually',
     availableFeatures: 'Available features',
@@ -116,21 +115,6 @@ export const enUS: LocalizationResource = {
     monthly: 'Monthly',
     pastDue: 'Past due',
     pay: 'Pay {{amount}}',
-    paymentMethods: 'Payment Methods',
-    paymentSource: {
-      applePayDescription: {
-        annual: 'Annual payment',
-        monthly: 'Monthly payment',
-      },
-      dev: {
-        anyNumbers: 'Any numbers',
-        cardNumber: 'Card number',
-        cvcZip: 'CVC, ZIP',
-        developmentMode: 'Development mode',
-        expirationDate: 'Expiration date',
-        testCardInfo: 'Test card information',
-      },
-    },
     popular: 'Popular',
     pricingTable: {
       billingCycle: 'Billing cycle',
@@ -167,6 +151,22 @@ export const enUS: LocalizationResource = {
     viewFeatures: 'View features',
     viewPayment: 'View payment',
     year: 'Year',
+    addPaymentMethod__label: 'Add payment method',
+    paymentMethods__label: 'Payment Methods',
+    paymentMethod: {
+      applePayDescription: {
+        annual: 'Annual payment',
+        monthly: 'Monthly payment',
+      },
+      dev: {
+        anyNumbers: 'Any numbers',
+        cardNumber: 'Card number',
+        cvcZip: 'CVC, ZIP',
+        developmentMode: 'Development mode',
+        expirationDate: 'Expiration date',
+        testCardInfo: 'Test card information',
+      },
+    },
   },
   createOrganization: {
     formButtonSubmit: 'Create organization',
@@ -278,7 +278,7 @@ export const enUS: LocalizationResource = {
         tableHeader__date: 'Date',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Make default',
         actionLabel__remove: 'Remove',
         add: 'Add new payment method',
@@ -287,11 +287,11 @@ export const enUS: LocalizationResource = {
         formButtonPrimary__add: 'Add Payment Method',
         formButtonPrimary__pay: 'Pay {{amount}}',
         payWithTestCardButton: 'Pay with test card',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} will be removed from this account.',
           messageLine2:
-            'You will no longer be able to use this payment source and any recurring subscriptions dependent on it will no longer work.',
-          successMessage: '{{paymentSource}} has been removed from your account.',
+            'You will no longer be able to use this payment method and any recurring subscriptions dependent on it will no longer work.',
+          successMessage: '{{paymentMethod}} has been removed from your account.',
           title: 'Remove payment method',
         },
         title: 'Payment methods',
@@ -971,7 +971,7 @@ export const enUS: LocalizationResource = {
         tableHeader__date: 'Date',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Make default',
         actionLabel__remove: 'Remove',
         add: 'Add new payment method',
@@ -980,11 +980,11 @@ export const enUS: LocalizationResource = {
         formButtonPrimary__add: 'Add Payment Method',
         formButtonPrimary__pay: 'Pay {{amount}}',
         payWithTestCardButton: 'Pay with test card',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} will be removed from this account.',
           messageLine2:
             'You will no longer be able to use this payment source and any recurring subscriptions dependent on it will no longer work.',
-          successMessage: '{{paymentSource}} has been removed from your account.',
+          successMessage: '{{paymentMethod}} has been removed from your account.',
           title: 'Remove payment method',
         },
         title: 'Payment methods',
diff --git a/packages/localizations/src/es-CR.ts b/packages/localizations/src/es-CR.ts
index 139d30ca159..b00c47d3b08 100644
--- a/packages/localizations/src/es-CR.ts
+++ b/packages/localizations/src/es-CR.ts
@@ -68,8 +68,8 @@ export const esCR: LocalizationResource = {
   badge__upcomingPlan: 'Próximo plan',
   badge__userDevice: 'Dispositivo de usuario',
   badge__you: 'Usted',
-  commerce: {
-    addPaymentMethod: 'Añadir método de pago',
+  billing: {
+    addPaymentMethod__label: 'Añadir método de pago',
     alwaysFree: 'Siempre gratis',
     annually: 'Anualmente',
     availableFeatures: 'Características disponibles',
@@ -121,8 +121,8 @@ export const esCR: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -284,7 +284,7 @@ export const esCR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -293,7 +293,7 @@ export const esCR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -973,7 +973,7 @@ export const esCR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Predeterminado',
         actionLabel__remove: 'Eliminar',
         add: 'Agregar un nuevo método de pago',
@@ -982,11 +982,11 @@ export const esCR: LocalizationResource = {
         formButtonPrimary__add: 'Agregar Método de Pago',
         formButtonPrimary__pay: 'Pagar {{amount}}',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} será eliminado de esta cuenta.',
           messageLine2:
             'No podrás utilizar este método de pago para ninguna suscripción actual y estas ya no funcionarán.',
-          successMessage: '{{paymentSource}} ha sido eliminada de tu cuenta.',
+          successMessage: '{{paymentMethod}} ha sido eliminada de tu cuenta.',
           title: 'Eliminar método de pago',
         },
         title: 'Opciones disponibles',
diff --git a/packages/localizations/src/es-ES.ts b/packages/localizations/src/es-ES.ts
index ec1f47b3ff8..ffe1d33bd28 100644
--- a/packages/localizations/src/es-ES.ts
+++ b/packages/localizations/src/es-ES.ts
@@ -68,8 +68,8 @@ export const esES: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Dispositivo de usuario',
   badge__you: 'Usted',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const esES: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const esES: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const esES: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -967,7 +967,7 @@ export const esES: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -976,7 +976,7 @@ export const esES: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/es-MX.ts b/packages/localizations/src/es-MX.ts
index de9d9515f66..0984a9bf249 100644
--- a/packages/localizations/src/es-MX.ts
+++ b/packages/localizations/src/es-MX.ts
@@ -68,8 +68,8 @@ export const esMX: LocalizationResource = {
   badge__upcomingPlan: 'Próximo plan',
   badge__userDevice: 'Dispositivo de usuario',
   badge__you: 'Usted',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -122,8 +122,8 @@ export const esMX: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -285,7 +285,7 @@ export const esMX: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -294,7 +294,7 @@ export const esMX: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -974,7 +974,7 @@ export const esMX: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Predeterminado',
         actionLabel__remove: 'Eliminar',
         add: 'Agregar un nuevo método de pago',
@@ -983,11 +983,11 @@ export const esMX: LocalizationResource = {
         formButtonPrimary__add: 'Agregar Método de Pago',
         formButtonPrimary__pay: 'Pagar {{amount}}',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} será eliminado de esta cuenta.',
           messageLine2:
             'No podrás utilizar este método de pago para ninguna suscripción actual y estas ya no funcionarán.',
-          successMessage: '{{paymentSource}} ha sido eliminada de tu cuenta.',
+          successMessage: '{{paymentMethod}} ha sido eliminada de tu cuenta.',
           title: 'Eliminar método de pago',
         },
         title: 'Opciones disponibles',
diff --git a/packages/localizations/src/es-UY.ts b/packages/localizations/src/es-UY.ts
index 9a0e88f99a3..590fdf1b88c 100644
--- a/packages/localizations/src/es-UY.ts
+++ b/packages/localizations/src/es-UY.ts
@@ -68,8 +68,8 @@ export const esUY: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Dispositivo del usuario',
   badge__you: 'Vos',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const esUY: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -284,7 +284,7 @@ export const esUY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -293,7 +293,7 @@ export const esUY: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -975,7 +975,7 @@ export const esUY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -984,7 +984,7 @@ export const esUY: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/fa-IR.ts b/packages/localizations/src/fa-IR.ts
index 32fb8a92b2b..accec4439fa 100644
--- a/packages/localizations/src/fa-IR.ts
+++ b/packages/localizations/src/fa-IR.ts
@@ -69,8 +69,8 @@ export const faIR: LocalizationResource = {
   badge__upcomingPlan: 'به زودی',
   badge__userDevice: 'دستگاه کاربر',
   badge__you: 'شما',
-  commerce: {
-    addPaymentMethod: 'افزودن روش پرداخت',
+  billing: {
+    addPaymentMethod__label: 'افزودن روش پرداخت',
     alwaysFree: 'همیشه رایگان',
     annually: 'سالانه',
     availableFeatures: 'ویژگی ها',
@@ -126,8 +126,8 @@ export const faIR: LocalizationResource = {
     monthly: 'ماهانه',
     pastDue: 'سررسید گذشته',
     pay: 'پرداخت {{amount}}',
-    paymentMethods: 'روش های پرداخت',
-    paymentSource: {
+    paymentMethods__label: 'روش های پرداخت',
+    paymentMethod: {
       applePayDescription: {
         annual: 'پرداخت سالانه',
         monthly: 'پرداخت ماهانه',
@@ -288,7 +288,7 @@ export const faIR: LocalizationResource = {
         tableHeader__date: 'تاریخ',
         tableHeader__status: 'وضعیت',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'پیش فرض کنید',
         actionLabel__remove: 'حذف',
         add: 'افزودن روش پرداخت جدید',
@@ -297,11 +297,11 @@ export const faIR: LocalizationResource = {
         formButtonPrimary__add: 'افزودن روش پرداخت',
         formButtonPrimary__pay: '{{amount}} پرداخت',
         payWithTestCardButton: 'پرداخت با کارت تست',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} از این حساب حذف خواهد شد.',
           messageLine2:
             'شما دیگر نمی‌توانید از این منبع پرداخت استفاده کنید و هرگونه اشتراک دوره‌ای وابسته به آن دیگر کار نخواهد کرد.',
-          successMessage: '{{paymentSource}} از حساب شما حذف شده است.',
+          successMessage: '{{paymentMethod}} از حساب شما حذف شده است.',
           title: 'حذف روش پرداخت',
         },
         title: 'روش های پرداخت',
@@ -973,7 +973,7 @@ export const faIR: LocalizationResource = {
         tableHeader__date: 'تاریخ',
         tableHeader__status: 'وضعیت',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'پیش فرض کنید',
         actionLabel__remove: 'حذف',
         add: 'افزودن روش پرداخت جدید',
@@ -982,11 +982,11 @@ export const faIR: LocalizationResource = {
         formButtonPrimary__add: 'افزودن روش پرداخت',
         formButtonPrimary__pay: '{{amount}} پرداخت',
         payWithTestCardButton: 'پرداخت با کارت تست',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} از این حساب حذف خواهد شد.',
           messageLine2:
             'شما دیگر نمی‌توانید از این منبع پرداخت استفاده کنید و هرگونه اشتراک دوره‌ای وابسته به آن دیگر کار نخواهد کرد.',
-          successMessage: '{{paymentSource}} از حساب شما حذف شده است.',
+          successMessage: '{{paymentMethod}} از حساب شما حذف شده است.',
           title: 'حذف روش پرداخت',
         },
         title: 'روش های پرداخت',
diff --git a/packages/localizations/src/fi-FI.ts b/packages/localizations/src/fi-FI.ts
index 72b135aa398..2d437e08856 100644
--- a/packages/localizations/src/fi-FI.ts
+++ b/packages/localizations/src/fi-FI.ts
@@ -68,8 +68,8 @@ export const fiFI: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Käyttäjän laite',
   badge__you: 'Sinä',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const fiFI: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const fiFI: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const fiFI: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -964,7 +964,7 @@ export const fiFI: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -973,7 +973,7 @@ export const fiFI: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/fr-FR.ts b/packages/localizations/src/fr-FR.ts
index 96c0fff29d4..edc9a5c117c 100644
--- a/packages/localizations/src/fr-FR.ts
+++ b/packages/localizations/src/fr-FR.ts
@@ -68,8 +68,8 @@ export const frFR: LocalizationResource = {
   badge__upcomingPlan: 'À venir',
   badge__userDevice: 'Appareil utilisateur',
   badge__you: 'Vous',
-  commerce: {
-    addPaymentMethod: 'Ajouter une méthode de paiement',
+  billing: {
+    addPaymentMethod__label: 'Ajouter une méthode de paiement',
     alwaysFree: 'Toujours gratuit',
     annually: 'Annuel',
     availableFeatures: 'Fonctionnalités disponibles',
@@ -123,8 +123,8 @@ export const frFR: LocalizationResource = {
     monthly: 'Mensuel',
     pastDue: undefined,
     pay: 'Payer {{amount}}',
-    paymentMethods: 'Méthodes de paiement',
-    paymentSource: {
+    paymentMethods__label: 'Méthodes de paiement',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Paiement annuel',
         monthly: 'Paiement mensuel',
@@ -287,7 +287,7 @@ export const frFR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Rendre par défaut',
         actionLabel__remove: 'Supprimer',
         add: 'Ajouter une nouvelle méthode de paiement',
@@ -296,11 +296,11 @@ export const frFR: LocalizationResource = {
         formButtonPrimary__add: 'Ajouter une méthode de paiement',
         formButtonPrimary__pay: 'Payer {{amount}}',
         payWithTestCardButton: 'Payer avec une carte de test',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} sera supprimé de ce compte.',
           messageLine2:
             'Vous ne pourrez plus utiliser cette méthode de paiement et tous les abonnements récurrents qui en dépendent ne fonctionneront plus.',
-          successMessage: '{{paymentSource}} a été supprimé de votre compte.',
+          successMessage: '{{paymentMethod}} a été supprimé de votre compte.',
           title: 'Supprimer une méthode de paiement',
         },
         title: 'Méthodes de paiement',
@@ -975,7 +975,7 @@ export const frFR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Rendre par défaut',
         actionLabel__remove: 'Supprimer',
         add: 'Ajouter une nouvelle méthode de paiement',
@@ -984,11 +984,11 @@ export const frFR: LocalizationResource = {
         formButtonPrimary__add: 'Ajouter une méthode de paiement',
         formButtonPrimary__pay: 'Payer {{amount}}',
         payWithTestCardButton: 'Payer avec une carte de test',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} sera supprimé de ce compte.',
           messageLine2:
             'Vous ne pourrez plus utiliser cette méthode de paiement et tous les abonnements récurrents qui en dépendent ne fonctionneront plus.',
-          successMessage: '{{paymentSource}} a été supprimé de votre compte.',
+          successMessage: '{{paymentMethod}} a été supprimé de votre compte.',
           title: 'Supprimer une méthode de paiement',
         },
         title: 'Méthodes de paiement',
diff --git a/packages/localizations/src/he-IL.ts b/packages/localizations/src/he-IL.ts
index 5d46c8d5017..8b1adef1148 100644
--- a/packages/localizations/src/he-IL.ts
+++ b/packages/localizations/src/he-IL.ts
@@ -68,8 +68,8 @@ export const heIL: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'מכשיר משתמש',
   badge__you: 'אתה',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const heIL: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const heIL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const heIL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -952,7 +952,7 @@ export const heIL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -961,7 +961,7 @@ export const heIL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/hi-IN.ts b/packages/localizations/src/hi-IN.ts
index 8fac22ce1f2..6f7b568a7b6 100644
--- a/packages/localizations/src/hi-IN.ts
+++ b/packages/localizations/src/hi-IN.ts
@@ -68,8 +68,8 @@ export const hiIN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'उपयोगकर्ता उपकरण',
   badge__you: 'आप',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const hiIN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const hiIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'डिफ़ॉल्ट बनाएं',
         actionLabel__remove: 'हटाएं',
         add: 'नया भुगतान स्रोत जोड़ें',
@@ -292,11 +292,11 @@ export const hiIN: LocalizationResource = {
         formButtonPrimary__add: 'भुगतान विधि जोड़ें',
         formButtonPrimary__pay: '{{amount}} का भुगतान करें',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} को इस खाते से हटा दिया जाएगा।',
           messageLine2:
             'आप अब इस भुगतान स्रोत का उपयोग नहीं कर पाएंगे और इस पर निर्भर कोई भी आवर्ती सदस्यता अब काम नहीं करेगी।',
-          successMessage: '{{paymentSource}} को आपके खाते से हटा दिया गया है।',
+          successMessage: '{{paymentMethod}} को आपके खाते से हटा दिया गया है।',
           title: 'भुगतान स्रोत हटाएं',
         },
         title: 'उपलब्ध विकल्प',
@@ -974,7 +974,7 @@ export const hiIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -983,7 +983,7 @@ export const hiIN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/hr-HR.ts b/packages/localizations/src/hr-HR.ts
index 3a2c43d1740..3b5843d9404 100644
--- a/packages/localizations/src/hr-HR.ts
+++ b/packages/localizations/src/hr-HR.ts
@@ -68,8 +68,8 @@ export const hrHR: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Korisnički uređaj',
   badge__you: 'Vi',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const hrHR: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const hrHR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const hrHR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -969,7 +969,7 @@ export const hrHR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -978,7 +978,7 @@ export const hrHR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/hu-HU.ts b/packages/localizations/src/hu-HU.ts
index 29ca7e2030d..6917c643a4b 100644
--- a/packages/localizations/src/hu-HU.ts
+++ b/packages/localizations/src/hu-HU.ts
@@ -68,8 +68,8 @@ export const huHU: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Felhasználói eszköz',
   badge__you: 'Te',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const huHU: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const huHU: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const huHU: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -964,7 +964,7 @@ export const huHU: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -973,7 +973,7 @@ export const huHU: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/id-ID.ts b/packages/localizations/src/id-ID.ts
index 0c3c52d115c..de015be9f84 100644
--- a/packages/localizations/src/id-ID.ts
+++ b/packages/localizations/src/id-ID.ts
@@ -68,8 +68,8 @@ export const idID: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Perangkat pengguna',
   badge__you: 'Anda',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const idID: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const idID: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const idID: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -973,7 +973,7 @@ export const idID: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -982,7 +982,7 @@ export const idID: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/is-IS.ts b/packages/localizations/src/is-IS.ts
index cf6e1241863..b271e847f08 100644
--- a/packages/localizations/src/is-IS.ts
+++ b/packages/localizations/src/is-IS.ts
@@ -68,8 +68,8 @@ export const isIS: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Notendatæki',
   badge__you: 'Þú',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const isIS: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const isIS: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const isIS: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -967,7 +967,7 @@ export const isIS: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -976,7 +976,7 @@ export const isIS: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/it-IT.ts b/packages/localizations/src/it-IT.ts
index 880490b3e12..06080286b5e 100644
--- a/packages/localizations/src/it-IT.ts
+++ b/packages/localizations/src/it-IT.ts
@@ -69,8 +69,8 @@ export const itIT: LocalizationResource = {
   badge__upcomingPlan: 'In arrivo',
   badge__userDevice: 'Dispositivo utente',
   badge__you: 'Tu',
-  commerce: {
-    addPaymentMethod: 'Aggiungi metodo di pagamento',
+  billing: {
+    addPaymentMethod__label: 'Aggiungi metodo di pagamento',
     alwaysFree: 'Sempre gratuito',
     annually: 'Annualmente',
     availableFeatures: 'Funzionalità disponibili',
@@ -127,8 +127,8 @@ export const itIT: LocalizationResource = {
     monthly: 'Mensile',
     pastDue: 'Scaduto',
     pay: 'Paga {{amount}}',
-    paymentMethods: 'Metodi di pagamento',
-    paymentSource: {
+    paymentMethods__label: 'Metodi di pagamento',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Pagamento annuale',
         monthly: 'Pagamento mensile',
@@ -290,7 +290,7 @@ export const itIT: LocalizationResource = {
         tableHeader__date: 'Data',
         tableHeader__status: 'Stato',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Imposta come predefinito',
         actionLabel__remove: 'Rimuovi',
         add: 'Aggiungi nuovo metodo di pagamento',
@@ -299,11 +299,11 @@ export const itIT: LocalizationResource = {
         formButtonPrimary__add: 'Aggiungi metodo di pagamento',
         formButtonPrimary__pay: 'Paga {{amount}}',
         payWithTestCardButton: 'Paga con carta di prova',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} verrà rimosso da questo account.',
           messageLine2:
             'Non potrai più utilizzare questo metodo di pagamento e gli abbonamenti ricorrenti che dipendono da esso non funzioneranno più.',
-          successMessage: '{{paymentSource}} è stato rimosso dal tuo account.',
+          successMessage: '{{paymentMethod}} è stato rimosso dal tuo account.',
           title: 'Rimuovi metodo di pagamento',
         },
         title: 'Metodi di pagamento',
@@ -972,7 +972,7 @@ export const itIT: LocalizationResource = {
         tableHeader__date: 'Data',
         tableHeader__status: 'Stato',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Imposta come predefinito',
         actionLabel__remove: 'Rimuovi',
         add: 'Aggiungi nuovo metodo di pagamento',
@@ -981,11 +981,11 @@ export const itIT: LocalizationResource = {
         formButtonPrimary__add: 'Aggiungi metodo di pagamento',
         formButtonPrimary__pay: 'Paga {{amount}}',
         payWithTestCardButton: 'Paga con carta di prova',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} verrà rimosso da questo account.',
           messageLine2:
             'Non potrai più utilizzare questo metodo di pagamento e gli abbonamenti ricorrenti che dipendono da esso non funzioneranno più.',
-          successMessage: '{{paymentSource}} è stato rimosso dal tuo account.',
+          successMessage: '{{paymentMethod}} è stato rimosso dal tuo account.',
           title: 'Rimuovi metodo di pagamento',
         },
         title: 'Metodi di pagamento',
diff --git a/packages/localizations/src/ja-JP.ts b/packages/localizations/src/ja-JP.ts
index 95c1f23bbb4..09005ef997e 100644
--- a/packages/localizations/src/ja-JP.ts
+++ b/packages/localizations/src/ja-JP.ts
@@ -68,8 +68,8 @@ export const jaJP: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'ユーザーデバイス',
   badge__you: 'あなた',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const jaJP: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const jaJP: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const jaJP: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -965,7 +965,7 @@ export const jaJP: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -974,7 +974,7 @@ export const jaJP: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/kk-KZ.ts b/packages/localizations/src/kk-KZ.ts
index 4a530c25ecb..1070330fcd9 100644
--- a/packages/localizations/src/kk-KZ.ts
+++ b/packages/localizations/src/kk-KZ.ts
@@ -68,8 +68,8 @@ export const kkKZ: LocalizationResource = {
   badge__upcomingPlan: 'Алдағы жоспар',
   badge__userDevice: 'Пайдаланушы құрылғысы',
   badge__you: 'Сіз',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const kkKZ: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const kkKZ: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Әдепкі ету',
         actionLabel__remove: 'Жою',
         add: 'Жаңа төлем әдісін қосу',
@@ -291,10 +291,10 @@ export const kkKZ: LocalizationResource = {
         formButtonPrimary__add: 'Төлем әдісін қосу',
         formButtonPrimary__pay: '{{amount}} төлеу',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} есептік жазбадан жойылады.',
           messageLine2: 'Бұл төлем әдісін қолдана алмайсыз және оған тәуелді жазылымдар жұмыс істемейді.',
-          successMessage: '{{paymentSource}} жойылды.',
+          successMessage: '{{paymentMethod}} жойылды.',
           title: 'Төлем әдісін жою',
         },
         title: 'Қолжетімді опциялар',
@@ -950,7 +950,7 @@ export const kkKZ: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Әдепкі ету',
         actionLabel__remove: 'Жою',
         add: 'Жаңа төлем әдісін қосу',
@@ -959,10 +959,10 @@ export const kkKZ: LocalizationResource = {
         formButtonPrimary__add: 'Төлем әдісін қосу',
         formButtonPrimary__pay: '{{amount}} төлеу',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} есептік жазбадан жойылады.',
           messageLine2: 'Бұл төлем әдісін қолдана алмайсыз және оған тәуелді жазылымдар жұмыс істемейді.',
-          successMessage: '{{paymentSource}} жойылды.',
+          successMessage: '{{paymentMethod}} жойылды.',
           title: 'Төлем әдісін жою',
         },
         title: 'Қолжетімді опциялар',
diff --git a/packages/localizations/src/ko-KR.ts b/packages/localizations/src/ko-KR.ts
index 745dc88cb5d..490869d54d4 100644
--- a/packages/localizations/src/ko-KR.ts
+++ b/packages/localizations/src/ko-KR.ts
@@ -68,8 +68,8 @@ export const koKR: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: '사용자 장치',
   badge__you: '당신',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const koKR: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const koKR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const koKR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -956,7 +956,7 @@ export const koKR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -965,7 +965,7 @@ export const koKR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/mn-MN.ts b/packages/localizations/src/mn-MN.ts
index 0fc706d34c5..9c2625fe1da 100644
--- a/packages/localizations/src/mn-MN.ts
+++ b/packages/localizations/src/mn-MN.ts
@@ -68,8 +68,8 @@ export const mnMN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Хэрэглэгчийн төхөөрөмж',
   badge__you: 'Чи',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const mnMN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const mnMN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const mnMN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -964,7 +964,7 @@ export const mnMN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -973,7 +973,7 @@ export const mnMN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/ms-MY.ts b/packages/localizations/src/ms-MY.ts
index 51d150d4d8c..6c4e9954cd4 100644
--- a/packages/localizations/src/ms-MY.ts
+++ b/packages/localizations/src/ms-MY.ts
@@ -68,8 +68,8 @@ export const msMY: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Peranti pengguna',
   badge__you: 'Anda',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const msMY: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const msMY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Jadikan lalai',
         actionLabel__remove: 'Keluarkan',
         add: 'Tambah sumber pembayaran baharu',
@@ -292,11 +292,11 @@ export const msMY: LocalizationResource = {
         formButtonPrimary__add: 'Tambah Kaedah Pembayaran',
         formButtonPrimary__pay: 'Bayar {{amount}}',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} akan dikeluarkan dari akaun ini.',
           messageLine2:
             'Anda tidak akan dapat menggunakan sumber pembayaran ini lagi dan langganan berulang yang bergantung padanya tidak akan berfungsi lagi.',
-          successMessage: '{{paymentSource}} telah dikeluarkan dari akaun anda.',
+          successMessage: '{{paymentMethod}} telah dikeluarkan dari akaun anda.',
           title: 'Keluarkan sumber pembayaran',
         },
         title: 'Pilihan tersedia',
@@ -978,7 +978,7 @@ export const msMY: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Jadikan lalai',
         actionLabel__remove: 'Keluarkan',
         add: 'Tambah sumber pembayaran baharu',
@@ -987,11 +987,11 @@ export const msMY: LocalizationResource = {
         formButtonPrimary__add: 'Tambah Kaedah Pembayaran',
         formButtonPrimary__pay: 'Bayar {{amount}}',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} akan dikeluarkan dari akaun ini.',
           messageLine2:
             'Anda tidak akan dapat menggunakan sumber pembayaran ini lagi dan langganan berulang yang bergantung padanya tidak akan berfungsi lagi.',
-          successMessage: '{{paymentSource}} telah dikeluarkan dari akaun anda.',
+          successMessage: '{{paymentMethod}} telah dikeluarkan dari akaun anda.',
           title: 'Keluarkan sumber pembayaran',
         },
         title: 'Pilihan tersedia',
diff --git a/packages/localizations/src/nb-NO.ts b/packages/localizations/src/nb-NO.ts
index 3b6f6c824c7..73c13c6d4e1 100644
--- a/packages/localizations/src/nb-NO.ts
+++ b/packages/localizations/src/nb-NO.ts
@@ -68,8 +68,8 @@ export const nbNO: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Brukerens enhet',
   badge__you: 'Du',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const nbNO: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const nbNO: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const nbNO: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -963,7 +963,7 @@ export const nbNO: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -972,7 +972,7 @@ export const nbNO: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/nl-BE.ts b/packages/localizations/src/nl-BE.ts
index 7f86192ddab..43fe5d9fad3 100644
--- a/packages/localizations/src/nl-BE.ts
+++ b/packages/localizations/src/nl-BE.ts
@@ -68,8 +68,8 @@ export const nlBE: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Gebruikersapparaat',
   badge__you: 'Jij',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const nlBE: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const nlBE: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const nlBE: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -963,7 +963,7 @@ export const nlBE: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -972,7 +972,7 @@ export const nlBE: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/nl-NL.ts b/packages/localizations/src/nl-NL.ts
index 2f8902f823b..db12051e7ce 100644
--- a/packages/localizations/src/nl-NL.ts
+++ b/packages/localizations/src/nl-NL.ts
@@ -68,8 +68,8 @@ export const nlNL: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Gebruikersapparaat',
   badge__you: 'Jij',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const nlNL: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const nlNL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const nlNL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -963,7 +963,7 @@ export const nlNL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -972,7 +972,7 @@ export const nlNL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/pl-PL.ts b/packages/localizations/src/pl-PL.ts
index 214b2f650d1..56f7484ced4 100644
--- a/packages/localizations/src/pl-PL.ts
+++ b/packages/localizations/src/pl-PL.ts
@@ -68,8 +68,8 @@ export const plPL: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Urządzenie użytkownika',
   badge__you: 'Ty',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const plPL: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const plPL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const plPL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -972,7 +972,7 @@ export const plPL: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -981,7 +981,7 @@ export const plPL: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/pt-BR.ts b/packages/localizations/src/pt-BR.ts
index 998082d79cb..bc0ea40bc99 100644
--- a/packages/localizations/src/pt-BR.ts
+++ b/packages/localizations/src/pt-BR.ts
@@ -69,8 +69,8 @@ export const ptBR: LocalizationResource = {
   badge__upcomingPlan: 'Próximo plano',
   badge__userDevice: 'Dispositivo do usuário',
   badge__you: 'Você',
-  commerce: {
-    addPaymentMethod: 'Adicionar método de pagamento',
+  billing: {
+    addPaymentMethod__label: 'Adicionar método de pagamento',
     alwaysFree: 'Gratuito',
     annually: 'Anualmente',
     availableFeatures: 'Recursos disponíveis',
@@ -127,8 +127,8 @@ export const ptBR: LocalizationResource = {
     monthly: 'Mensal',
     pastDue: 'Atrasado',
     pay: 'Pagar {{amount}}',
-    paymentMethods: 'Métodos de pagamento',
-    paymentSource: {
+    paymentMethods__label: 'Métodos de pagamento',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Pagamento anual',
         monthly: 'Pagamento mensal',
@@ -289,7 +289,7 @@ export const ptBR: LocalizationResource = {
         tableHeader__date: 'Data',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Tornar padrão',
         actionLabel__remove: 'Remover',
         add: 'Adicionar novo método de pagamento',
@@ -298,11 +298,11 @@ export const ptBR: LocalizationResource = {
         formButtonPrimary__add: 'Adicionar Método de Pagamento',
         formButtonPrimary__pay: 'Pagar {{amount}}',
         payWithTestCardButton: 'Pagar com cartão de teste',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} será removido desta conta.',
           messageLine2:
             'Você não poderá mais usar esta forma de pagamento e quaisquer assinaturas recorrentes dependentes dela deixarão de funcionar.',
-          successMessage: '{{paymentSource}} foi removido da sua conta.',
+          successMessage: '{{paymentMethod}} foi removido da sua conta.',
           title: 'Remover método de pagamento',
         },
         title: 'Métodos de pagamento',
@@ -979,7 +979,7 @@ export const ptBR: LocalizationResource = {
         tableHeader__date: 'Data',
         tableHeader__status: 'Status',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Tornar padrão',
         actionLabel__remove: 'Remover',
         add: 'Adicionar novo método de pagamento',
@@ -988,11 +988,11 @@ export const ptBR: LocalizationResource = {
         formButtonPrimary__add: 'Adicionar Método de Pagamento',
         formButtonPrimary__pay: 'Pagar {{amount}}',
         payWithTestCardButton: 'Pagar com cartão de teste',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} será removido desta conta.',
           messageLine2:
             'Você não poderá mais usar esta forma de pagamento e quaisquer assinaturas recorrentes dependentes dela deixarão de funcionar.',
-          successMessage: '{{paymentSource}} foi removido da sua conta.',
+          successMessage: '{{paymentMethod}} foi removido da sua conta.',
           title: 'Remover método de pagamento',
         },
         title: 'Métodos de pagamento',
diff --git a/packages/localizations/src/pt-PT.ts b/packages/localizations/src/pt-PT.ts
index a12686980fa..9cce802cc0f 100644
--- a/packages/localizations/src/pt-PT.ts
+++ b/packages/localizations/src/pt-PT.ts
@@ -68,8 +68,8 @@ export const ptPT: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Dispositivo do utilizador',
   badge__you: 'O utilizador',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const ptPT: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const ptPT: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const ptPT: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -963,7 +963,7 @@ export const ptPT: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -972,7 +972,7 @@ export const ptPT: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/ro-RO.ts b/packages/localizations/src/ro-RO.ts
index 780521a2820..e05a8c01c67 100644
--- a/packages/localizations/src/ro-RO.ts
+++ b/packages/localizations/src/ro-RO.ts
@@ -69,8 +69,8 @@ export const roRO: LocalizationResource = {
   badge__upcomingPlan: 'Urmează',
   badge__userDevice: 'Dispozitiv utilizator',
   badge__you: 'Tu',
-  commerce: {
-    addPaymentMethod: 'Adaugă metodă de plată',
+  billing: {
+    addPaymentMethod__label: 'Adaugă metodă de plată',
     alwaysFree: 'Întotdeauna gratuit',
     annually: 'Anual',
     availableFeatures: 'Funcții disponibile',
@@ -127,8 +127,8 @@ export const roRO: LocalizationResource = {
     monthly: 'Lunar',
     pastDue: 'Restanță',
     pay: 'Plătește {{amount}}',
-    paymentMethods: 'Metode de plată',
-    paymentSource: {
+    paymentMethods__label: 'Metode de plată',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Plată anuală',
         monthly: 'Plată lunară',
@@ -289,7 +289,7 @@ export const roRO: LocalizationResource = {
         tableHeader__date: 'Dată',
         tableHeader__status: 'Stare',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Setează ca implicită',
         actionLabel__remove: 'Elimină',
         add: 'Adaugă metodă de plată nouă',
@@ -298,11 +298,11 @@ export const roRO: LocalizationResource = {
         formButtonPrimary__add: 'Adaugă metoda de plată',
         formButtonPrimary__pay: 'Plătește {{amount}}',
         payWithTestCardButton: 'Plătește cu card de test',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} va fi eliminat(ă) din acest cont.',
           messageLine2:
             'Nu vei mai putea folosi această metodă de plată, iar abonamentele recurente dependente de ea nu vor mai funcționa.',
-          successMessage: '{{paymentSource}} a fost eliminată din contul tău.',
+          successMessage: '{{paymentMethod}} a fost eliminată din contul tău.',
           title: 'Elimină metoda de plată',
         },
         title: 'Metode de plată',
@@ -978,7 +978,7 @@ export const roRO: LocalizationResource = {
         tableHeader__date: 'Dată',
         tableHeader__status: 'Stare',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Setează ca implicită',
         actionLabel__remove: 'Elimină',
         add: 'Adaugă metodă de plată nouă',
@@ -987,11 +987,11 @@ export const roRO: LocalizationResource = {
         formButtonPrimary__add: 'Adaugă metoda de plată',
         formButtonPrimary__pay: 'Plătește {{amount}}',
         payWithTestCardButton: 'Plătește cu card de test',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} va fi eliminat(ă) din acest cont.',
           messageLine2:
             'Nu vei mai putea utiliza această sursă de plată, iar orice abonamente recurente care depind de ea nu vor mai funcționa.',
-          successMessage: '{{paymentSource}} a fost eliminată din contul tău.',
+          successMessage: '{{paymentMethod}} a fost eliminată din contul tău.',
           title: 'Elimină metoda de plată',
         },
         title: 'Metode de plată',
diff --git a/packages/localizations/src/ru-RU.ts b/packages/localizations/src/ru-RU.ts
index dffc987f6a5..0a3cf32bc93 100644
--- a/packages/localizations/src/ru-RU.ts
+++ b/packages/localizations/src/ru-RU.ts
@@ -68,8 +68,8 @@ export const ruRU: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Пользовательское устройство',
   badge__you: 'Вы',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const ruRU: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -286,7 +286,7 @@ export const ruRU: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -295,7 +295,7 @@ export const ruRU: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -978,7 +978,7 @@ export const ruRU: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Сделать основной',
         actionLabel__remove: 'Удалить',
         add: 'Добавить новый способ оплаты',
@@ -987,11 +987,11 @@ export const ruRU: LocalizationResource = {
         formButtonPrimary__add: 'Добавить способ оплаты',
         formButtonPrimary__pay: 'Оплатить {{amount}}',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} будет удален из этой учетной записи.',
           messageLine2:
             'Вы больше не сможете использовать этот способ оплаты, и любые зависимые функции больше не будут работать.',
-          successMessage: '{{paymentSource}} был удален из вашей учетной записи.',
+          successMessage: '{{paymentMethod}} был удален из вашей учетной записи.',
           title: 'Удалить способ оплаты',
         },
         title: 'Доступные опции',
diff --git a/packages/localizations/src/sk-SK.ts b/packages/localizations/src/sk-SK.ts
index 8d0f5772c5c..7d2969cffc5 100644
--- a/packages/localizations/src/sk-SK.ts
+++ b/packages/localizations/src/sk-SK.ts
@@ -68,8 +68,8 @@ export const skSK: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Zariadenie používateľa',
   badge__you: 'Vy',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const skSK: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const skSK: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const skSK: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -970,7 +970,7 @@ export const skSK: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -979,7 +979,7 @@ export const skSK: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/sr-RS.ts b/packages/localizations/src/sr-RS.ts
index eac8fb1ed93..2bcbf457fd7 100644
--- a/packages/localizations/src/sr-RS.ts
+++ b/packages/localizations/src/sr-RS.ts
@@ -68,8 +68,8 @@ export const srRS: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Korisnički uređaj',
   badge__you: 'Vi',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const srRS: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const srRS: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const srRS: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -963,7 +963,7 @@ export const srRS: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -972,7 +972,7 @@ export const srRS: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/sv-SE.ts b/packages/localizations/src/sv-SE.ts
index fda1e62179a..bb08b4c1706 100644
--- a/packages/localizations/src/sv-SE.ts
+++ b/packages/localizations/src/sv-SE.ts
@@ -68,8 +68,8 @@ export const svSE: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Användarens enhet',
   badge__you: 'Du',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const svSE: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const svSE: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const svSE: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -966,7 +966,7 @@ export const svSE: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -975,7 +975,7 @@ export const svSE: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/ta-IN.ts b/packages/localizations/src/ta-IN.ts
index 5033689a9bc..9aa1be4dcdb 100644
--- a/packages/localizations/src/ta-IN.ts
+++ b/packages/localizations/src/ta-IN.ts
@@ -68,8 +68,8 @@ export const taIN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'பயனர் சாதனம்',
   badge__you: 'நீங்கள்',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const taIN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const taIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'இயல்புநிலையாக்கு',
         actionLabel__remove: 'நீக்கு',
         add: 'புதிய கட்டண மூலத்தைச் சேர்க்கவும்',
@@ -292,11 +292,11 @@ export const taIN: LocalizationResource = {
         formButtonPrimary__add: 'கட்டண முறையைச் சேர்',
         formButtonPrimary__pay: '{{amount}} செலுத்து',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} இந்த கணக்கிலிருந்து நீக்கப்படும்.',
           messageLine2:
             'இந்த கட்டண மூலத்தை இனி பயன்படுத்த முடியாது மற்றும் அதைச் சார்ந்த எந்த தொடர் சந்தாக்களும் இனி செயல்படாது.',
-          successMessage: '{{paymentSource}} உங்கள் கணக்கிலிருந்து நீக்கப்பட்டது.',
+          successMessage: '{{paymentMethod}} உங்கள் கணக்கிலிருந்து நீக்கப்பட்டது.',
           title: 'கட்டண மூலத்தை நீக்கு',
         },
         title: 'கிடைக்கும் விருப்பங்கள்',
@@ -979,7 +979,7 @@ export const taIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'இயல்புநிலையாக்கு',
         actionLabel__remove: 'நீக்கு',
         add: 'புதிய கட்டண மூலத்தைச் சேர்க்கவும்',
@@ -988,11 +988,11 @@ export const taIN: LocalizationResource = {
         formButtonPrimary__add: 'கட்டண முறையைச் சேர்',
         formButtonPrimary__pay: '{{amount}} செலுத்து',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} இந்த கணக்கிலிருந்து நீக்கப்படும்.',
           messageLine2:
             'இந்த கட்டண மூலத்தை இனி பயன்படுத்த முடியாது மற்றும் அதைச் சார்ந்த எந்த தொடர் சந்தாக்களும் இனி செயல்படாது.',
-          successMessage: '{{paymentSource}} உங்கள் கணக்கிலிருந்து நீக்கப்பட்டது.',
+          successMessage: '{{paymentMethod}} உங்கள் கணக்கிலிருந்து நீக்கப்பட்டது.',
           title: 'கட்டண மூலத்தை நீக்கு',
         },
         title: 'கிடைக்கும் விருப்பங்கள்',
diff --git a/packages/localizations/src/te-IN.ts b/packages/localizations/src/te-IN.ts
index 4a37d630eda..8216ddc9a09 100644
--- a/packages/localizations/src/te-IN.ts
+++ b/packages/localizations/src/te-IN.ts
@@ -68,8 +68,8 @@ export const teIN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'వినియోగదారు పరికరం',
   badge__you: 'మీరు',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const teIN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const teIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'డిఫాల్ట్‌గా చేయండి',
         actionLabel__remove: 'తొలగించండి',
         add: 'కొత్త చెల్లింపు మూలాన్ని జోడించండి',
@@ -291,11 +291,11 @@ export const teIN: LocalizationResource = {
         formButtonPrimary__add: 'చెల్లింపు పద్ధతిని జోడించండి',
         formButtonPrimary__pay: '{{amount}} చెల్లించండి',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} ఈ ఖాతా నుండి తొలగించబడుతుంది.',
           messageLine2:
             'మీరు ఇకపై ఈ చెల్లింపు మూలాన్ని ఉపయోగించలేరు మరియు దానిపై ఆధారపడిన పునరావృత సబ్‌స్క్రిప్షన్‌లు ఇకపై పనిచేయవు.',
-          successMessage: '{{paymentSource}} మీ ఖాతా నుండి తొలగించబడింది.',
+          successMessage: '{{paymentMethod}} మీ ఖాతా నుండి తొలగించబడింది.',
           title: 'చెల్లింపు మూలాన్ని తొలగించండి',
         },
         title: 'అందుబాటులో ఉన్న ఎంపికలు',
@@ -975,7 +975,7 @@ export const teIN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'డిఫాల్ట్‌గా చేయండి',
         actionLabel__remove: 'తొలగించండి',
         add: 'కొత్త చెల్లింపు మూలాన్ని జోడించండి',
@@ -984,11 +984,11 @@ export const teIN: LocalizationResource = {
         formButtonPrimary__add: 'చెల్లింపు పద్ధతిని జోడించండి',
         formButtonPrimary__pay: '{{amount}} చెల్లించండి',
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} ఈ ఖాతా నుండి తొలగించబడుతుంది.',
           messageLine2:
             'మీరు ఇకపై ఈ చెల్లింపు మూలాన్ని ఉపయోగించలేరు మరియు దానిపై ఆధారపడిన పునరావృత సబ్‌స్క్రిప్షన్‌లు ఇకపై పనిచేయవు.',
-          successMessage: '{{paymentSource}} మీ ఖాతా నుండి తొలగించబడింది.',
+          successMessage: '{{paymentMethod}} మీ ఖాతా నుండి తొలగించబడింది.',
           title: 'చెల్లింపు మూలాన్ని తొలగించండి',
         },
         title: 'అందుబాటులో ఉన్న ఎంపికలు',
diff --git a/packages/localizations/src/th-TH.ts b/packages/localizations/src/th-TH.ts
index a2b97936422..b9c069ec395 100644
--- a/packages/localizations/src/th-TH.ts
+++ b/packages/localizations/src/th-TH.ts
@@ -69,8 +69,8 @@ export const thTH: LocalizationResource = {
   badge__upcomingPlan: 'แผนที่จะมา',
   badge__userDevice: 'อุปกรณ์ผู้ใช้',
   badge__you: 'คุณ',
-  commerce: {
-    addPaymentMethod: 'เพิ่มวิธีชำระเงิน',
+  billing: {
+    addPaymentMethod__label: 'เพิ่มวิธีชำระเงิน',
     alwaysFree: 'ฟรีตลอดไป',
     annually: 'รายปี',
     availableFeatures: 'ฟีเจอร์ที่มี',
@@ -125,8 +125,8 @@ export const thTH: LocalizationResource = {
     monthly: 'รายเดือน',
     pastDue: 'เกินกำหนด',
     pay: 'ชำระ {{amount}}',
-    paymentMethods: 'วิธีการชำระเงิน',
-    paymentSource: {
+    paymentMethods__label: 'วิธีการชำระเงิน',
+    paymentMethod: {
       applePayDescription: {
         annual: 'ชำระรายปี',
         monthly: 'ชำระรายเดือน',
@@ -286,7 +286,7 @@ export const thTH: LocalizationResource = {
         tableHeader__date: 'วันที่',
         tableHeader__status: 'สถานะ',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'ตั้งเป็นค่าเริ่มต้น',
         actionLabel__remove: 'ลบ',
         add: 'เพิ่มวิธีชำระเงินใหม่',
@@ -295,11 +295,11 @@ export const thTH: LocalizationResource = {
         formButtonPrimary__add: 'เพิ่มวิธีชำระเงิน',
         formButtonPrimary__pay: 'ชำระ {{amount}}',
         payWithTestCardButton: 'ชำระด้วยบัตรทดสอบ',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} จะถูกลบออกจากบัญชีนี้',
           messageLine2:
             'คุณจะไม่สามารถใช้แหล่งชำระเงินนี้ได้อีก และการสมัครสมาชิกแบบต่ออายุอัตโนมัติที่เกี่ยวข้องจะไม่ทำงานอีกต่อไป',
-          successMessage: '{{paymentSource}} ได้ถูกลบออกจากบัญชีของคุณแล้ว',
+          successMessage: '{{paymentMethod}} ได้ถูกลบออกจากบัญชีของคุณแล้ว',
           title: 'ลบวิธีชำระเงิน',
         },
         title: 'วิธีการชำระเงิน',
@@ -963,7 +963,7 @@ export const thTH: LocalizationResource = {
         tableHeader__date: 'วันที่',
         tableHeader__status: 'สถานะ',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'ตั้งเป็นค่าเริ่มต้น',
         actionLabel__remove: 'ลบ',
         add: 'เพิ่มวิธีชำระเงินใหม่',
@@ -972,11 +972,11 @@ export const thTH: LocalizationResource = {
         formButtonPrimary__add: 'เพิ่มวิธีชำระเงิน',
         formButtonPrimary__pay: 'ชำระ {{amount}}',
         payWithTestCardButton: 'ชำระด้วยบัตรทดสอบ',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} จะถูกลบออกจากบัญชีนี้',
           messageLine2:
             'คุณจะไม่สามารถใช้แหล่งชำระเงินนี้ได้อีก และการสมัครสมาชิกแบบต่ออายุอัตโนมัติที่เกี่ยวข้องจะไม่ทำงานอีกต่อไป',
-          successMessage: '{{paymentSource}} ได้ถูกลบออกจากบัญชีของคุณแล้ว',
+          successMessage: '{{paymentMethod}} ได้ถูกลบออกจากบัญชีของคุณแล้ว',
           title: 'ลบวิธีชำระเงิน',
         },
         title: 'วิธีการชำระเงิน',
diff --git a/packages/localizations/src/tr-TR.ts b/packages/localizations/src/tr-TR.ts
index cb817c0b305..c2b8d692a22 100644
--- a/packages/localizations/src/tr-TR.ts
+++ b/packages/localizations/src/tr-TR.ts
@@ -68,8 +68,8 @@ export const trTR: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Kullanıcı cihazı',
   badge__you: 'Siz',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const trTR: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -282,7 +282,7 @@ export const trTR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -291,7 +291,7 @@ export const trTR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -967,7 +967,7 @@ export const trTR: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -976,7 +976,7 @@ export const trTR: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/uk-UA.ts b/packages/localizations/src/uk-UA.ts
index 56ba41328b1..c5a54449192 100644
--- a/packages/localizations/src/uk-UA.ts
+++ b/packages/localizations/src/uk-UA.ts
@@ -68,8 +68,8 @@ export const ukUA: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: 'Пристрій користувача',
   badge__you: 'Ви',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const ukUA: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -283,7 +283,7 @@ export const ukUA: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -292,7 +292,7 @@ export const ukUA: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -960,7 +960,7 @@ export const ukUA: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -969,7 +969,7 @@ export const ukUA: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/vi-VN.ts b/packages/localizations/src/vi-VN.ts
index 7b249e63003..97f972db046 100644
--- a/packages/localizations/src/vi-VN.ts
+++ b/packages/localizations/src/vi-VN.ts
@@ -69,8 +69,8 @@ export const viVN: LocalizationResource = {
   badge__upcomingPlan: 'Sắp tới',
   badge__userDevice: 'Thiết bị người dùng',
   badge__you: 'Bạn',
-  commerce: {
-    addPaymentMethod: 'Thêm phương thức thanh toán',
+  billing: {
+    addPaymentMethod__label: 'Thêm phương thức thanh toán',
     alwaysFree: 'Miễn phí mãi mãi',
     annually: 'Hàng năm',
     availableFeatures: 'Tính năng có sẵn',
@@ -125,8 +125,8 @@ export const viVN: LocalizationResource = {
     monthly: 'Hàng tháng',
     pastDue: 'Quá hạn',
     pay: 'Thanh toán {{amount}}',
-    paymentMethods: 'Phương thức thanh toán',
-    paymentSource: {
+    paymentMethods__label: 'Phương thức thanh toán',
+    paymentMethod: {
       applePayDescription: {
         annual: 'Thanh toán hàng năm',
         monthly: 'Thanh toán hàng tháng',
@@ -287,7 +287,7 @@ export const viVN: LocalizationResource = {
         tableHeader__date: 'Ngày',
         tableHeader__status: 'Trạng thái',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Làm mặc định',
         actionLabel__remove: 'Xóa',
         add: 'Thêm phương thức thanh toán mới',
@@ -296,11 +296,11 @@ export const viVN: LocalizationResource = {
         formButtonPrimary__add: 'Thêm phương thức thanh toán',
         formButtonPrimary__pay: 'Thanh toán {{amount}}',
         payWithTestCardButton: 'Thanh toán với thẻ thử nghiệm',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} sẽ bị xóa khỏi tài khoản này.',
           messageLine2:
             'Bạn sẽ không còn thể sử dụng nguồn thanh toán này và bất kỳ đăng ký lặp lại nào phụ thuộc vào nó sẽ không còn hoạt động.',
-          successMessage: '{{paymentSource}} đã bị xóa khỏi tài khoản của bạn.',
+          successMessage: '{{paymentMethod}} đã bị xóa khỏi tài khoản của bạn.',
           title: 'Xóa phương thức thanh toán',
         },
         title: 'Phương thức thanh toán',
@@ -970,7 +970,7 @@ export const viVN: LocalizationResource = {
         tableHeader__date: 'Ngày',
         tableHeader__status: 'Trạng thái',
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: 'Làm mặc định',
         actionLabel__remove: 'Xóa',
         add: 'Thêm phương thức thanh toán mới',
@@ -979,11 +979,11 @@ export const viVN: LocalizationResource = {
         formButtonPrimary__add: 'Thêm phương thức thanh toán',
         formButtonPrimary__pay: 'Thanh toán {{amount}}',
         payWithTestCardButton: 'Thanh toán với thẻ thử',
-        removeResource: {
+        removeMethod: {
           messageLine1: '{{identifier}} sẽ bị xóa khỏi tài khoản này.',
           messageLine2:
             'Bạn sẽ không còn thể sử dụng nguồn thanh toán này và bất kỳ đăng ký lặp lại nào phụ thuộc vào nó sẽ không còn hoạt động.',
-          successMessage: '{{paymentSource}} đã bị xóa khỏi tài khoản của bạn.',
+          successMessage: '{{paymentMethod}} đã bị xóa khỏi tài khoản của bạn.',
           title: 'Xóa phương thức thanh toán',
         },
         title: 'Phương thức thanh toán',
diff --git a/packages/localizations/src/zh-CN.ts b/packages/localizations/src/zh-CN.ts
index e86d0d6a4fd..ca6904ef7f6 100644
--- a/packages/localizations/src/zh-CN.ts
+++ b/packages/localizations/src/zh-CN.ts
@@ -68,8 +68,8 @@ export const zhCN: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: '用户设备',
   badge__you: '您',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const zhCN: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -281,7 +281,7 @@ export const zhCN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -290,7 +290,7 @@ export const zhCN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -946,7 +946,7 @@ export const zhCN: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -955,7 +955,7 @@ export const zhCN: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/localizations/src/zh-TW.ts b/packages/localizations/src/zh-TW.ts
index 12b30b589eb..0109a24c276 100644
--- a/packages/localizations/src/zh-TW.ts
+++ b/packages/localizations/src/zh-TW.ts
@@ -68,8 +68,8 @@ export const zhTW: LocalizationResource = {
   badge__upcomingPlan: undefined,
   badge__userDevice: '用戶設備',
   badge__you: '您',
-  commerce: {
-    addPaymentMethod: undefined,
+  billing: {
+    addPaymentMethod__label: undefined,
     alwaysFree: undefined,
     annually: undefined,
     availableFeatures: undefined,
@@ -121,8 +121,8 @@ export const zhTW: LocalizationResource = {
     monthly: undefined,
     pastDue: undefined,
     pay: undefined,
-    paymentMethods: undefined,
-    paymentSource: {
+    paymentMethods__label: undefined,
+    paymentMethod: {
       applePayDescription: {
         annual: undefined,
         monthly: undefined,
@@ -281,7 +281,7 @@ export const zhTW: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -290,7 +290,7 @@ export const zhTW: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
@@ -945,7 +945,7 @@ export const zhTW: LocalizationResource = {
         tableHeader__date: undefined,
         tableHeader__status: undefined,
       },
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         actionLabel__default: undefined,
         actionLabel__remove: undefined,
         add: undefined,
@@ -954,7 +954,7 @@ export const zhTW: LocalizationResource = {
         formButtonPrimary__add: undefined,
         formButtonPrimary__pay: undefined,
         payWithTestCardButton: undefined,
-        removeResource: {
+        removeMethod: {
           messageLine1: undefined,
           messageLine2: undefined,
           successMessage: undefined,
diff --git a/packages/types/src/billing.ts b/packages/types/src/billing.ts
index 488b8ff9eb4..139511c38be 100644
--- a/packages/types/src/billing.ts
+++ b/packages/types/src/billing.ts
@@ -217,7 +217,7 @@ export interface FeatureResource extends ClerkResource {
 }
 
 /**
- * The status of a payment source.
+ * The status of a payment method.
  * @inline
  */
 export type BillingPaymentMethodStatus = 'active' | 'expired' | 'disconnected';
@@ -308,9 +308,9 @@ export interface BillingPaymentMethodResource extends ClerkResource {
    */
   walletType: string | undefined;
   /**
-   * A function that removes this payment source from the account. Accepts the following parameters:
+   * A function that removes this payment method from the account. Accepts the following parameters:
    * <ul>
-   *  <li>`orgId?` (`string`): The ID of the organization to remove the payment source from.</li>
+   *  <li>`orgId?` (`string`): The ID of the organization to remove the payment method from.</li>
    * </ul>
    *
    * @param params - The parameters for the remove operation.
@@ -319,7 +319,7 @@ export interface BillingPaymentMethodResource extends ClerkResource {
   // TODO: orgId should be implied by the payment method
   remove: (params?: RemovePaymentMethodParams) => Promise<DeletedObjectResource>;
   /**
-   * A function that sets this payment source as the default for the account. Accepts the following parameters:
+   * A function that sets this payment method as the default for the account. Accepts the following parameters:
    * <ul>
    *  <li>`orgId?` (`string`): The ID of the organization to set as the default.</li>
    * </ul>
@@ -390,7 +390,7 @@ export interface BillingPaymentResource extends ClerkResource {
    */
   updatedAt: Date;
   /**
-   * The payment source being used for the payment, such as credit card or bank account.
+   * The payment method being used for the payment, such as credit card or bank account.
    */
   paymentMethod: BillingPaymentMethodResource;
   /**
@@ -492,7 +492,7 @@ export interface BillingSubscriptionItemResource extends ClerkResource {
    */
   id: string;
   /**
-   * The unique identifier for the payment source being used for the subscription item.
+   * The unique identifier for the payment method being used for the subscription item.
    */
   //TODO(@COMMERCE): should this be nullable ?
   paymentMethodId: string;
@@ -705,7 +705,7 @@ export type CreateCheckoutParams = WithOptionalOrgType<{
 export type ConfirmCheckoutParams =
   | {
       /**
-       * The ID of a saved payment source to use for this checkout.
+       * The ID of a saved payment method to use for this checkout.
        */
       paymentSourceId?: string;
     }
diff --git a/packages/types/src/localization.ts b/packages/types/src/localization.ts
index f007114741d..d1cf1ac078e 100644
--- a/packages/types/src/localization.ts
+++ b/packages/types/src/localization.ts
@@ -169,7 +169,7 @@ export type __internal_LocalizationResource = {
   membershipRole__admin: LocalizationValue;
   membershipRole__basicMember: LocalizationValue;
   membershipRole__guestMember: LocalizationValue;
-  commerce: {
+  billing: {
     month: LocalizationValue;
     year: LocalizationValue;
     free: LocalizationValue;
@@ -206,14 +206,28 @@ export type __internal_LocalizationResource = {
     totalDue: LocalizationValue;
     totalDueToday: LocalizationValue;
     pastDue: LocalizationValue;
-    paymentMethods: LocalizationValue;
-    addPaymentMethod: LocalizationValue;
     pay: LocalizationValue<'amount'>;
     cancelSubscriptionTitle: LocalizationValue<'plan'>;
     cancelSubscriptionNoCharge: LocalizationValue;
     cancelSubscriptionAccessUntil: LocalizationValue<'plan' | 'date'>;
     cancelSubscriptionPastDue: LocalizationValue;
     popular: LocalizationValue;
+    paymentMethods__label: LocalizationValue;
+    addPaymentMethod__label: LocalizationValue;
+    paymentMethod: {
+      dev: {
+        testCardInfo: LocalizationValue;
+        developmentMode: LocalizationValue;
+        cardNumber: LocalizationValue;
+        expirationDate: LocalizationValue;
+        cvcZip: LocalizationValue;
+        anyNumbers: LocalizationValue;
+      };
+      applePayDescription: {
+        monthly: LocalizationValue;
+        annual: LocalizationValue;
+      };
+    };
     subscriptionDetails: {
       title: LocalizationValue;
       currentBillingCycle: LocalizationValue;
@@ -237,20 +251,6 @@ export type __internal_LocalizationResource = {
       billingCycle: LocalizationValue;
       included: LocalizationValue;
     };
-    paymentSource: {
-      dev: {
-        testCardInfo: LocalizationValue;
-        developmentMode: LocalizationValue;
-        cardNumber: LocalizationValue;
-        expirationDate: LocalizationValue;
-        cvcZip: LocalizationValue;
-        anyNumbers: LocalizationValue;
-      };
-      applePayDescription: {
-        monthly: LocalizationValue;
-        annual: LocalizationValue;
-      };
-    };
     checkout: {
       title: LocalizationValue;
       title__paymentSuccessful: LocalizationValue;
@@ -898,7 +898,7 @@ export type __internal_LocalizationResource = {
         tableHeader__amount: LocalizationValue;
         tableHeader__status: LocalizationValue;
       };
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         title: LocalizationValue;
         add: LocalizationValue;
         addSubtitle: LocalizationValue;
@@ -907,11 +907,11 @@ export type __internal_LocalizationResource = {
         actionLabel__remove: LocalizationValue;
         formButtonPrimary__add: LocalizationValue;
         formButtonPrimary__pay: LocalizationValue;
-        removeResource: {
+        removeMethod: {
           title: LocalizationValue;
           messageLine1: LocalizationValue<'identifier'>;
           messageLine2: LocalizationValue;
-          successMessage: LocalizationValue<'paymentSource'>;
+          successMessage: LocalizationValue<'paymentMethod'>;
         };
         payWithTestCardButton: LocalizationValue;
       };
@@ -1126,7 +1126,7 @@ export type __internal_LocalizationResource = {
         tableHeader__amount: LocalizationValue;
         tableHeader__status: LocalizationValue;
       };
-      paymentSourcesSection: {
+      paymentMethodsSection: {
         title: LocalizationValue;
         add: LocalizationValue;
         addSubtitle: LocalizationValue;
@@ -1135,11 +1135,11 @@ export type __internal_LocalizationResource = {
         actionLabel__remove: LocalizationValue;
         formButtonPrimary__add: LocalizationValue;
         formButtonPrimary__pay: LocalizationValue;
-        removeResource: {
+        removeMethod: {
           title: LocalizationValue;
           messageLine1: LocalizationValue<'identifier'>;
           messageLine2: LocalizationValue;
-          successMessage: LocalizationValue<'paymentSource'>;
+          successMessage: LocalizationValue<'paymentMethod'>;
         };
         payWithTestCardButton: LocalizationValue;
       };