diff --git a/static/app/views/insights/crons/components/processingErrors/processingErrorItem.tsx b/static/app/views/insights/crons/components/processingErrors/processingErrorItem.tsx
index 21f6b2871fc499..e50ac274c5f0d8 100644
--- a/static/app/views/insights/crons/components/processingErrors/processingErrorItem.tsx
+++ b/static/app/views/insights/crons/components/processingErrors/processingErrorItem.tsx
@@ -55,8 +55,10 @@ export function ProcessingErrorItem({error, checkinTooltip}: Props) {
         {checkinTooltip}
       );
     case ProcessingErrorType.MONITOR_DISABLED_NO_QUOTA:
+      // TODO: this should really be a gsApp hook so we have subscription context, but
+      // for now we'll just default to "pay-as-you-go" since it's the modern term
       return tct(
-        'A [checkinTooltip:check-in] upsert was sent, but due to insufficient quota a new monitor could not be enabled. Increase your Crons on-demand budget in your [link: subscription settings], and then enable this monitor.',
+        'A [checkinTooltip:check-in] upsert was sent, but due to insufficient quota a new monitor could not be enabled. Increase your Crons pay-as-you-go budget in your [link: subscription settings], and then enable this monitor.',
         {checkinTooltip, link: <Link to="/settings/billing/overview/" />}
       );
     case ProcessingErrorType.MONITOR_INVALID_CONFIG:
diff --git a/static/gsAdmin/components/customerStatus.tsx b/static/gsAdmin/components/customerStatus.tsx
index 94757084e545eb..21cdacf9d11382 100644
--- a/static/gsAdmin/components/customerStatus.tsx
+++ b/static/gsAdmin/components/customerStatus.tsx
@@ -43,8 +43,6 @@ const getTooltip = ({planDetails, trialPlan}: Subscription) => (
     )}
     <dt>Base Price:</dt>
     <dd>{formatCurrency(planDetails?.price)}</dd>
-    <dt>On-Demand:</dt>
-    <dd>{formatCurrency(planDetails?.onDemandEventPrice)} / event</dd>
     <dt>Contract:</dt>
     <dd>{planDetails?.contractInterval}</dd>
     <dt>Billed:</dt>
diff --git a/static/gsAdmin/components/customers/customerHistory.tsx b/static/gsAdmin/components/customers/customerHistory.tsx
index f25abe47797ee8..dcd74628ce3f77 100644
--- a/static/gsAdmin/components/customers/customerHistory.tsx
+++ b/static/gsAdmin/components/customers/customerHistory.tsx
@@ -32,7 +32,7 @@ function CustomerHistory({orgId, ...props}: Props) {
       columns={[
         <th key="period">Period</th>,
         <th key="onDemand" style={{width: 200, textAlign: 'right'}}>
-          On-Demand
+          Pay-as-you-go
         </th>,
         <th key="reserved" style={{width: 200, textAlign: 'right'}}>
           Reserved
diff --git a/static/gsAdmin/components/customers/customerOverview.spec.tsx b/static/gsAdmin/components/customers/customerOverview.spec.tsx
index ba8a291655b145..7fbccdcafa4792 100644
--- a/static/gsAdmin/components/customers/customerOverview.spec.tsx
+++ b/static/gsAdmin/components/customers/customerOverview.spec.tsx
@@ -190,20 +190,18 @@ describe('CustomerOverview', () => {
     expect(screen.getByText('Total: $0.00 / $3,000,000.00')).toBeInTheDocument();
 
     // CPE information
-    expect(screen.getByText('Pay-as-you-go Cost-Per-Event Errors:')).toBeInTheDocument();
+    expect(screen.getByText('On-Demand Cost-Per-Event Errors:')).toBeInTheDocument();
     expect(screen.getByText('$0.12345678')).toBeInTheDocument();
     expect(
-      screen.getByText('Pay-as-you-go Cost-Per-Event Performance units:')
+      screen.getByText('On-Demand Cost-Per-Event Performance units:')
     ).toBeInTheDocument();
     expect(screen.getByText('$1.00000000')).toBeInTheDocument();
-    expect(screen.getByText('Pay-as-you-go Cost-Per-Event Replays:')).toBeInTheDocument();
+    expect(screen.getByText('On-Demand Cost-Per-Event Replays:')).toBeInTheDocument();
     expect(screen.getByText('$0.50000000')).toBeInTheDocument();
-    expect(
-      screen.getByText('Pay-as-you-go Cost-Per-Event Attachments:')
-    ).toBeInTheDocument();
+    expect(screen.getByText('On-Demand Cost-Per-Event Attachments:')).toBeInTheDocument();
     expect(screen.getByText('$0.20300000')).toBeInTheDocument();
     expect(
-      screen.getByText('Pay-as-you-go Cost-Per-Event Cron monitors:')
+      screen.getByText('On-Demand Cost-Per-Event Cron monitors:')
     ).toBeInTheDocument();
     expect(screen.getByText('$0.07550000')).toBeInTheDocument();
   });
diff --git a/static/gsAdmin/components/customers/customerOverview.tsx b/static/gsAdmin/components/customers/customerOverview.tsx
index 383b8dd3b61ecd..a7ea8693073b89 100644
--- a/static/gsAdmin/components/customers/customerOverview.tsx
+++ b/static/gsAdmin/components/customers/customerOverview.tsx
@@ -32,6 +32,7 @@ import type {
 } from 'getsentry/types';
 import {BillingType, OnDemandBudgetMode} from 'getsentry/types';
 import {
+  displayBudgetName,
   formatBalance,
   formatReservedWithUnits,
   getActiveProductTrial,
@@ -130,6 +131,7 @@ function SubscriptionSummary({customer, onAction}: SubscriptionSummaryProps) {
             <small>{customer.contractInterval}</small>
           </DetailLabel>
         )}
+        {/* TODO(billing): Should we start calling On-Demand periods "Pay-as-you-go" periods? */}
         <DetailLabel title="On-Demand">
           <OnDemandSummary customer={customer} />
         </DetailLabel>
@@ -213,7 +215,9 @@ function ReservedData({customer}: ReservedDataProps) {
                   : 'None'}
               </DetailLabel>
               {customer.onDemandInvoicedManual && (
-                <DetailLabel title={`Pay-as-you-go Cost-Per-Event ${categoryName}`}>
+                <DetailLabel
+                  title={`${displayBudgetName(customer.planDetails, {title: true})} Cost-Per-Event ${categoryName}`}
+                >
                   {typeof categoryHistory.paygCpe === 'number'
                     ? displayPriceWithCents({
                         cents: categoryHistory.paygCpe,
diff --git a/static/gsAdmin/components/customers/customerStatsFilters.tsx b/static/gsAdmin/components/customers/customerStatsFilters.tsx
index 2ef00cca06f8c8..6cc88ca35f2ca1 100644
--- a/static/gsAdmin/components/customers/customerStatsFilters.tsx
+++ b/static/gsAdmin/components/customers/customerStatsFilters.tsx
@@ -92,6 +92,7 @@ export function CustomerStatsFilters({
 
   const {start, end, period, utc} = pageDateTime;
 
+  // TODO(billing): Should we start calling On-Demand periods "Pay-as-you-go" periods?
   const onDemandLabel = (
     <Fragment>
       On-Demand (
diff --git a/static/gsAdmin/components/customers/pendingChanges.spec.tsx b/static/gsAdmin/components/customers/pendingChanges.spec.tsx
index 16cecdf8a12994..5c415eea713e0d 100644
--- a/static/gsAdmin/components/customers/pendingChanges.spec.tsx
+++ b/static/gsAdmin/components/customers/pendingChanges.spec.tsx
@@ -46,6 +46,7 @@ describe('PendingChanges', () => {
           name: 'Team (Enterprise)',
           contractInterval: 'annual',
           billingInterval: 'annual',
+          budgetTerm: 'on-demand',
         }),
         plan: 'am1_team_ent',
         planName: 'Team (Enterprise)',
@@ -87,7 +88,7 @@ describe('PendingChanges', () => {
     expect(container).toHaveTextContent(
       'The following changes will take effect on Feb 16, 2022'
     );
-    expect(container).toHaveTextContent('On-demand maximum — $0.00 → $500.00');
+    expect(container).toHaveTextContent('On-Demand maximum — $0.00 → $500.00');
   });
 
   it('renders pending changes with all categories', () => {
@@ -100,6 +101,7 @@ describe('PendingChanges', () => {
           name: 'Team (Enterprise)',
           contractInterval: 'annual',
           billingInterval: 'annual',
+          budgetTerm: 'on-demand',
         }),
         plan: 'am3_team_ent',
         planName: 'Team (Enterprise)',
@@ -140,7 +142,7 @@ describe('PendingChanges', () => {
     expect(container).toHaveTextContent(
       'The following changes will take effect on Feb 20, 2024'
     );
-    expect(container).toHaveTextContent('On-demand maximum — $0.00 → $500.00');
+    expect(container).toHaveTextContent('On-Demand maximum — $0.00 → $500.00');
   });
 
   it('renders on-demand budgets', () => {
@@ -189,7 +191,7 @@ describe('PendingChanges', () => {
       'The following changes will take effect on Feb 16, 2022'
     );
     expect(container).toHaveTextContent(
-      'On-demand budget — shared on-demand budget of $100 → per-category on-demand budget (errors at $3, transactions at $2, and attachments at $1)'
+      'On-Demand Budget — shared on-demand budget of $100 → per-category on-demand budget (errors at $3, transactions at $2, and attachments at $1)'
     );
   });
 
@@ -234,7 +236,7 @@ describe('PendingChanges', () => {
     );
     expect(container).toHaveTextContent('Plan changes — Developer → Team (Enterprise)');
     expect(container).toHaveTextContent(
-      'On-demand budget — shared on-demand budget of $100 → per-category on-demand budget (errors at $3, transactions at $2, and attachments at $1)'
+      'On-Demand Budget — shared on-demand budget of $100 → per-category on-demand budget (errors at $3, transactions at $2, and attachments at $1)'
     );
     expect(screen.getAllByText(/The following changes will take effect on/)).toHaveLength(
       1
diff --git a/static/gsAdmin/components/customers/pendingChanges.tsx b/static/gsAdmin/components/customers/pendingChanges.tsx
index 9b174a06eb93e2..94508208364239 100644
--- a/static/gsAdmin/components/customers/pendingChanges.tsx
+++ b/static/gsAdmin/components/customers/pendingChanges.tsx
@@ -10,7 +10,7 @@ import {DataCategory} from 'sentry/types/core';
 import {RESERVED_BUDGET_QUOTA} from 'getsentry/constants';
 import {usePlanMigrations} from 'getsentry/hooks/usePlanMigrations';
 import type {Plan, PlanMigration, Subscription} from 'getsentry/types';
-import {formatReservedWithUnits} from 'getsentry/utils/billing';
+import {displayBudgetName, formatReservedWithUnits} from 'getsentry/utils/billing';
 import {
   getPlanCategoryName,
   getReservedBudgetDisplayName,
@@ -307,7 +307,8 @@ function getOnDemandChanges(subscription: Subscription) {
       );
       changes.push(
         <span>
-          On-demand budget — {current} → {change}
+          {displayBudgetName(pendingChanges.planDetails, {title: true, withBudget: true})}{' '}
+          — {current} → {change}
         </span>
       );
     }
@@ -316,7 +317,8 @@ function getOnDemandChanges(subscription: Subscription) {
     const change = getStringForPrice(pendingChanges.onDemandMaxSpend);
     changes.push(
       <span>
-        On-demand maximum — {old} → {change}
+        {displayBudgetName(pendingChanges.planDetails, {title: true})} maximum — {old} →{' '}
+        {change}
       </span>
     );
   }
diff --git a/static/gsAdmin/components/provisionSubscriptionAction.spec.tsx b/static/gsAdmin/components/provisionSubscriptionAction.spec.tsx
index 68c2bdbad17645..28ce92d7d96c00 100644
--- a/static/gsAdmin/components/provisionSubscriptionAction.spec.tsx
+++ b/static/gsAdmin/components/provisionSubscriptionAction.spec.tsx
@@ -281,22 +281,22 @@ describe('provisionSubscriptionAction', () => {
     );
 
     expect(
-      within(container).getByLabelText('On-Demand Max Spend Setting')
+      within(container).getByLabelText('Pay-as-you-go Max Spend Setting')
     ).toBeInTheDocument();
     expect(
-      within(container).queryByLabelText('On-Demand Cost-Per-Event Errors')
+      within(container).queryByLabelText('Pay-as-you-go Cost-Per-Event Errors')
     ).not.toBeInTheDocument();
     expect(
-      within(container).queryByLabelText('On-Demand Cost-Per-Event Performance Units')
+      within(container).queryByLabelText('Pay-as-you-go Cost-Per-Event Performance Units')
     ).not.toBeInTheDocument();
     expect(
-      within(container).queryByLabelText('On-Demand Cost-Per-Event Replays')
+      within(container).queryByLabelText('Pay-as-you-go Cost-Per-Event Replays')
     ).not.toBeInTheDocument();
     expect(
-      within(container).queryByLabelText('On-Demand Cost-Per-Event Attachments')
+      within(container).queryByLabelText('Pay-as-you-go Cost-Per-Event Attachments')
     ).not.toBeInTheDocument();
     expect(
-      within(container).queryByLabelText('On-Demand Cost-Per-Event Cron Monitors')
+      within(container).queryByLabelText('Pay-as-you-go Cost-Per-Event Cron Monitors')
     ).not.toBeInTheDocument();
   });
 
@@ -325,19 +325,19 @@ describe('provisionSubscriptionAction', () => {
     ).not.toBeInTheDocument();
 
     await selectEvent.select(
-      screen.getByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      screen.getByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Shared'
     );
     expect(
-      (await within(container).findAllByLabelText(/On-Demand Cost-Per-Event/)).length
+      (await within(container).findAllByLabelText(/Pay-as-you-go Cost-Per-Event/)).length
     ).toBeGreaterThan(0);
 
     await selectEvent.select(
-      screen.getByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      screen.getByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Disable'
     );
     expect(
-      within(container).queryByLabelText(/On-Demand Cost-Per-Event/)
+      within(container).queryByLabelText(/Pay-as-you-go Cost-Per-Event/)
     ).not.toBeInTheDocument();
   });
 
@@ -363,7 +363,7 @@ describe('provisionSubscriptionAction', () => {
       'Invoiced'
     );
     await selectEvent.select(
-      screen.getByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      screen.getByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Shared'
     );
     const disabledSoftCapFields = screen.getAllByLabelText(/Soft Cap Type/);
@@ -389,7 +389,7 @@ describe('provisionSubscriptionAction', () => {
       'Invoiced'
     );
     await selectEvent.select(
-      screen.getByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      screen.getByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Disable'
     );
     const enabledSoftCapFields = screen.getAllByLabelText(/Soft Cap Type/);
@@ -845,21 +845,21 @@ describe('provisionSubscriptionAction', () => {
       'Invoiced'
     );
     await selectEvent.select(
-      await screen.findByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      await screen.findByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Shared'
     );
 
     expect(
-      within(container).getByLabelText('Retain On-Demand Budget')
+      within(container).getByLabelText('Retain Pay-as-you-go Budget')
     ).toBeInTheDocument();
 
     await selectEvent.select(
-      await screen.findByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      await screen.findByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Per Category'
     );
 
     expect(
-      within(container).queryByLabelText('Retain On-Demand Budget')
+      within(container).queryByLabelText('Retain Pay-as-you-go Budget')
     ).not.toBeInTheDocument();
 
     await selectEvent.select(
@@ -1251,7 +1251,7 @@ describe('provisionSubscriptionAction', () => {
     );
 
     await selectEvent.select(
-      await screen.findByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      await screen.findByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Disable'
     );
 
@@ -1380,7 +1380,7 @@ describe('provisionSubscriptionAction', () => {
     );
 
     await selectEvent.select(
-      await screen.findByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      await screen.findByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Disable'
     );
 
@@ -1500,7 +1500,7 @@ describe('provisionSubscriptionAction', () => {
     );
 
     await selectEvent.select(
-      await screen.findByRole('textbox', {name: 'On-Demand Max Spend Setting'}),
+      await screen.findByRole('textbox', {name: 'Pay-as-you-go Max Spend Setting'}),
       'Disable'
     );
 
diff --git a/static/gsAdmin/components/provisionSubscriptionAction.tsx b/static/gsAdmin/components/provisionSubscriptionAction.tsx
index 367883c6449150..7d7312003fafcc 100644
--- a/static/gsAdmin/components/provisionSubscriptionAction.tsx
+++ b/static/gsAdmin/components/provisionSubscriptionAction.tsx
@@ -32,6 +32,7 @@ import {
   type Subscription,
 } from 'getsentry/types';
 import {
+  displayBudgetName,
   getAmPlanTier,
   isAm3DsPlan,
   isAm3Plan,
@@ -376,8 +377,8 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
     this.state.data.seerBudget;
 
   /**
-   * If the user is changing the on-demand max spend mode or disabling it,
-   * don't retain the customer's existing on-demand max spend settings.
+   * If the user is changing the PAYG max spend mode or disabling it,
+   * don't retain the customer's existing PAYG max spend settings.
    */
   disableRetainOnDemand = () => {
     if (this.state.data.onDemandInvoicedManual === null) {
@@ -442,7 +443,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
       }
     });
 
-    // remove on-demand fields if the plan is not invoiced
+    // remove PAYG fields if the plan is not invoiced
     if (postData.type !== 'invoiced') {
       delete postData.onDemandInvoicedManual;
       const paygCpeFields = Object.keys(postData).filter(key =>
@@ -462,7 +463,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
       }));
     }
 
-    // soft cap and on-demand max spend are mutually exclusive
+    // soft cap and PAYG max spend are mutually exclusive
     if (this.isEnablingOnDemandMaxSpend()) {
       Object.keys(postData).forEach(key => {
         if (key.startsWith('softCapType')) {
@@ -534,7 +535,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
       }
     }
 
-    // override retainOnDemandBudget based on whether user is changing the mode or disabling on-demand, or not
+    // override retainOnDemandBudget based on whether user is changing the mode or disabling PAYG, or not
     postData.retainOnDemandBudget = postData.retainOnDemandBudget
       ? !this.disableRetainOnDemand()
       : false;
@@ -620,6 +621,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
     const isAm3Ds = isAm3DsPlan(data.plan);
     const hasCustomSkuPrices = isAmEnt;
     const hasCustomPrice = hasCustomSkuPrices || !!data.managed; // Refers to ACV
+    const selectedPlan = this.state.provisionablePlans[data.plan];
 
     if (this.state.isLoading) {
       return <LoadingIndicator />;
@@ -771,7 +773,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
                 />
                 {this.state.data.type === 'invoiced' && (
                   <StyledSelectFieldWithHelpText
-                    label="On-Demand Max Spend Setting"
+                    label={`${selectedPlan ? displayBudgetName(selectedPlan, {title: true}) : 'Pay-as-you-go'} Max Spend Setting`}
                     name="onDemandInvoicedManual"
                     choices={
                       isAm3Plan(this.state.data.plan)
@@ -785,7 +787,7 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
                             ['DISABLE', 'Disable'],
                           ]
                     }
-                    help="Used to enable (Shared or Per Category) or disable on-demand max spend for invoiced customers. Cannot be provisioned with soft cap."
+                    help={`Used to enable (Shared or Per Category) or disable ${selectedPlan ? displayBudgetName(selectedPlan) : 'pay-as-you-go'} max spend for invoiced customers. Cannot be provisioned with soft cap.`}
                     clearable
                     disabled={
                       this.state.data.type === 'credit_card' || this.isEnablingSoftCap()
@@ -802,10 +804,10 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
 
                 {!this.disableRetainOnDemand() && (
                   <BooleanField
-                    label="Retain On-Demand Budget"
+                    label={`Retain ${selectedPlan ? displayBudgetName(selectedPlan, {title: true}) : 'Pay-as-you-go'} Budget`}
                     name="retainOnDemandBudget"
                     value={this.state.data.retainOnDemandBudget}
-                    help="Check to retain the customer's current On-Demand Budget. Otherwise, the customer's On-Demand Budget will be set based on the default calculations (0.5 times the monthly plan price)."
+                    help={`Check to retain the customer's current ${selectedPlan ? displayBudgetName(selectedPlan, {title: true}) : 'Pay-as-you-go'} Budget. Otherwise, the customer's ${selectedPlan ? displayBudgetName(selectedPlan) : 'Pay-as-you-go'} Budget will be set based on the default calculations (0.5 times the monthly plan price).`}
                     onChange={v =>
                       this.setState(state => ({
                         ...state,
@@ -817,252 +819,235 @@ class ProvisionSubscriptionModal extends Component<ModalProps, ModalState> {
                     }
                   />
                 )}
-                {this.state.data.plan &&
-                  (this.state.provisionablePlans[this.state.data.plan]?.categories
-                    .length ?? 0) > 0 && (
-                    <Fragment>
-                      <SectionHeader>Plan Quotas</SectionHeader>
-                      <SectionHeaderDescription>
-                        Monthly quantities for each SKU
-                      </SectionHeaderDescription>
-                      {this.state.data.plan &&
-                        (
-                          this.state.provisionablePlans[this.state.data.plan]
-                            ?.categories ?? []
-                        ).map(category => {
-                          const categoryInfo = getCategoryInfoFromPlural(category);
-                          if (!categoryInfo) {
-                            return null;
-                          }
-                          const titleName = getPlanCategoryName({
-                            plan: this.state.provisionablePlans[this.state.data.plan],
-                            category,
-                            title: true,
-                            hadCustomDynamicSampling: isAm3Ds,
-                          });
-                          const suffix = isByteCategory(category) ? ' (in GB)' : '';
-                          const capitalizedApiName = this.capitalizeForApiName(
-                            categoryInfo.plural
-                          );
-                          return (
-                            <Fragment key={categoryInfo.plural}>
-                              <NumberField
-                                label={`Reserved ${titleName}${suffix}`}
-                                name={`reserved${capitalizedApiName}`}
-                                required
-                                disabled={
+                {selectedPlan && (selectedPlan?.categories.length ?? 0) > 0 && (
+                  <Fragment>
+                    <SectionHeader>Plan Quotas</SectionHeader>
+                    <SectionHeaderDescription>
+                      Monthly quantities for each SKU
+                    </SectionHeaderDescription>
+                    {selectedPlan?.categories.map(category => {
+                      const categoryInfo = getCategoryInfoFromPlural(category);
+                      if (!categoryInfo) {
+                        return null;
+                      }
+                      const titleName = getPlanCategoryName({
+                        plan: selectedPlan,
+                        category,
+                        title: true,
+                        hadCustomDynamicSampling: isAm3Ds,
+                      });
+                      const suffix = isByteCategory(category) ? ' (in GB)' : '';
+                      const capitalizedApiName = this.capitalizeForApiName(
+                        categoryInfo.plural
+                      );
+                      return (
+                        <Fragment key={categoryInfo.plural}>
+                          <NumberField
+                            label={`Reserved ${titleName}${suffix}`}
+                            name={`reserved${capitalizedApiName}`}
+                            required
+                            disabled={this.state.data[`reservedCpe${capitalizedApiName}`]}
+                            value={this.state.data[`reserved${capitalizedApiName}`]}
+                            onChange={v =>
+                              this.setState(state => ({
+                                ...state,
+                                data: {
+                                  ...state.data,
+                                  [`reserved${capitalizedApiName}`]: v,
+                                },
+                              }))
+                            }
+                          />
+                          <SelectField
+                            label={`Soft Cap Type ${titleName}`}
+                            name={`softCapType${capitalizedApiName}`}
+                            clearable
+                            required={false}
+                            choices={[
+                              ['ON_DEMAND', 'On Demand'],
+                              ['TRUE_FORWARD', 'True Forward'],
+                            ]}
+                            disabled={this.isEnablingOnDemandMaxSpend()}
+                            value={this.state.data[`softCapType${capitalizedApiName}`]}
+                            onChange={v =>
+                              this.setState(state => ({
+                                ...state,
+                                data: {
+                                  ...state.data,
+                                  [`softCapType${capitalizedApiName}`]: v ? v : null,
+                                },
+                              }))
+                            }
+                          />
+                          {this.isReservedBudgetCategory(isAm3Ds, category) && (
+                            <StyledDollarsAndCentsField
+                              label={`Reserved Cost-Per-Event ${titleName}`}
+                              name={`reservedCpe${capitalizedApiName}`}
+                              value={data[`reservedCpe${capitalizedApiName}`]}
+                              step={0.00000001}
+                              min={0}
+                              max={1}
+                              onChange={v =>
+                                this.setState(state => ({
+                                  ...state,
+                                  data: {
+                                    ...state.data,
+                                    [`reservedCpe${capitalizedApiName}`]: v,
+                                    [`reserved${capitalizedApiName}`]:
+                                      RESERVED_BUDGET_QUOTA,
+                                  },
+                                }))
+                              }
+                              onBlur={() => {
+                                const currentValue = parseFloat(
                                   this.state.data[`reservedCpe${capitalizedApiName}`]
-                                }
-                                value={this.state.data[`reserved${capitalizedApiName}`]}
-                                onChange={v =>
+                                );
+                                if (!isNaN(currentValue)) {
                                   this.setState(state => ({
                                     ...state,
                                     data: {
                                       ...state.data,
-                                      [`reserved${capitalizedApiName}`]: v,
+                                      [`reservedCpe${capitalizedApiName}`]:
+                                        currentValue.toFixed(CPE_DECIMAL_PRECISION),
                                     },
-                                  }))
-                                }
-                              />
-                              <SelectField
-                                label={`Soft Cap Type ${titleName}`}
-                                name={`softCapType${capitalizedApiName}`}
-                                clearable
-                                required={false}
-                                choices={[
-                                  ['ON_DEMAND', 'On Demand'],
-                                  ['TRUE_FORWARD', 'True Forward'],
-                                ]}
-                                disabled={this.isEnablingOnDemandMaxSpend()}
-                                value={
-                                  this.state.data[`softCapType${capitalizedApiName}`]
+                                  }));
                                 }
-                                onChange={v =>
+                              }}
+                            />
+                          )}
+                          {this.isEnablingOnDemandMaxSpend() && (
+                            <StyledDollarsAndCentsField
+                              label={`${selectedPlan ? displayBudgetName(selectedPlan, {title: true}) : 'Pay-as-you-go'} Cost-Per-Event ${titleName}`}
+                              name={`paygCpe${capitalizedApiName}`}
+                              value={data[`paygCpe${capitalizedApiName}`]}
+                              step={0.00000001}
+                              min={0.00000001}
+                              max={1}
+                              onChange={v =>
+                                this.setState(state => ({
+                                  ...state,
+                                  data: {
+                                    ...state.data,
+                                    [`paygCpe${capitalizedApiName}`]: v,
+                                  },
+                                }))
+                              }
+                              required
+                              onBlur={() => {
+                                const currentValue = parseFloat(
+                                  this.state.data[`paygCpe${capitalizedApiName}`]
+                                );
+                                if (!isNaN(currentValue)) {
                                   this.setState(state => ({
                                     ...state,
                                     data: {
                                       ...state.data,
-                                      [`softCapType${capitalizedApiName}`]: v ? v : null,
+                                      [`paygCpe${capitalizedApiName}`]:
+                                        currentValue.toFixed(CPE_DECIMAL_PRECISION),
                                     },
-                                  }))
+                                  }));
                                 }
-                              />
-                              {this.isReservedBudgetCategory(isAm3Ds, category) && (
-                                <StyledDollarsAndCentsField
-                                  label={`Reserved Cost-Per-Event ${titleName}`}
-                                  name={`reservedCpe${capitalizedApiName}`}
-                                  value={data[`reservedCpe${capitalizedApiName}`]}
-                                  step={0.00000001}
-                                  min={0}
-                                  max={1}
-                                  onChange={v =>
-                                    this.setState(state => ({
-                                      ...state,
-                                      data: {
-                                        ...state.data,
-                                        [`reservedCpe${capitalizedApiName}`]: v,
-                                        [`reserved${capitalizedApiName}`]:
-                                          RESERVED_BUDGET_QUOTA,
-                                      },
-                                    }))
-                                  }
-                                  onBlur={() => {
-                                    const currentValue = parseFloat(
-                                      this.state.data[`reservedCpe${capitalizedApiName}`]
-                                    );
-                                    if (!isNaN(currentValue)) {
-                                      this.setState(state => ({
-                                        ...state,
-                                        data: {
-                                          ...state.data,
-                                          [`reservedCpe${capitalizedApiName}`]:
-                                            currentValue.toFixed(CPE_DECIMAL_PRECISION),
-                                        },
-                                      }));
-                                    }
-                                  }}
-                                />
-                              )}
-                              {this.isEnablingOnDemandMaxSpend() && (
-                                <StyledDollarsAndCentsField
-                                  label={`On-Demand Cost-Per-Event ${titleName}`}
-                                  name={`paygCpe${capitalizedApiName}`}
-                                  value={data[`paygCpe${capitalizedApiName}`]}
-                                  step={0.00000001}
-                                  min={0.00000001}
-                                  max={1}
-                                  onChange={v =>
-                                    this.setState(state => ({
-                                      ...state,
-                                      data: {
-                                        ...state.data,
-                                        [`paygCpe${capitalizedApiName}`]: v,
-                                      },
-                                    }))
-                                  }
-                                  required
-                                  onBlur={() => {
-                                    const currentValue = parseFloat(
-                                      this.state.data[`paygCpe${capitalizedApiName}`]
-                                    );
-                                    if (!isNaN(currentValue)) {
-                                      this.setState(state => ({
-                                        ...state,
-                                        data: {
-                                          ...state.data,
-                                          [`paygCpe${capitalizedApiName}`]:
-                                            currentValue.toFixed(CPE_DECIMAL_PRECISION),
-                                        },
-                                      }));
-                                    }
-                                  }}
-                                />
-                              )}
-                            </Fragment>
-                          );
-                        })}
-                      {this.isSettingSeerBudget() && (
-                        <StyledDollarsField
-                          label="Seer Budget"
-                          name="seerBudget"
-                          help="Monthly reserved budget for Seer"
-                          required={this.isSettingSeerBudget()}
-                          value={data.seerBudget}
-                          onChange={v =>
-                            this.setState(state => ({
-                              ...state,
-                              data: {
-                                ...state.data,
-                                seerBudget: v,
-                              },
-                            }))
-                          }
-                        />
-                      )}
-                      {isAm3DsPlan(this.state.data.plan) && (
-                        <StyledDollarsField
-                          label="Dynamic Sampling Budget"
-                          name="dynamicSamplingBudget"
-                          help="Monthly reserved budget for Dynamic Sampling"
-                          required={this.isSettingSpansBudget()}
-                          value={data.dynamicSamplingBudget}
-                          onChange={v =>
-                            this.setState(state => ({
-                              ...state,
-                              data: {
-                                ...state.data,
-                                dynamicSamplingBudget: v,
-                              },
-                            }))
-                          }
-                        />
-                      )}
-                    </Fragment>
-                  )}
+                              }}
+                            />
+                          )}
+                        </Fragment>
+                      );
+                    })}
+                    {this.isSettingSeerBudget() && (
+                      <StyledDollarsField
+                        label="Seer Budget"
+                        name="seerBudget"
+                        help="Monthly reserved budget for Seer"
+                        required={this.isSettingSeerBudget()}
+                        value={data.seerBudget}
+                        onChange={v =>
+                          this.setState(state => ({
+                            ...state,
+                            data: {
+                              ...state.data,
+                              seerBudget: v,
+                            },
+                          }))
+                        }
+                      />
+                    )}
+                    {isAm3DsPlan(selectedPlan.id) && (
+                      <StyledDollarsField
+                        label="Dynamic Sampling Budget"
+                        name="dynamicSamplingBudget"
+                        help="Monthly reserved budget for Dynamic Sampling"
+                        required={this.isSettingSpansBudget()}
+                        value={data.dynamicSamplingBudget}
+                        onChange={v =>
+                          this.setState(state => ({
+                            ...state,
+                            data: {
+                              ...state.data,
+                              dynamicSamplingBudget: v,
+                            },
+                          }))
+                        }
+                      />
+                    )}
+                  </Fragment>
+                )}
               </div>
               <div>
                 <SectionHeader>Reserved Volume Prices</SectionHeader>
                 <SectionHeaderDescription>
                   Annual prices for reserved volumes, in whole dollars.
                 </SectionHeaderDescription>
-                {this.state.data.plan &&
-                  this.state.provisionablePlans[this.state.data.plan]?.categories.map(
-                    category => {
-                      const categoryInfo = getCategoryInfoFromPlural(category);
-                      if (!categoryInfo) {
-                        return null;
+                {selectedPlan?.categories.map(category => {
+                  const categoryInfo = getCategoryInfoFromPlural(category);
+                  if (!categoryInfo) {
+                    return null;
+                  }
+                  const titleName = getPlanCategoryName({
+                    plan: selectedPlan,
+                    category,
+                    title: true,
+                    hadCustomDynamicSampling: isAm3Ds,
+                  });
+                  const settingReservedBudget = this.isSettingReservedBudget(category);
+                  const isDisabled =
+                    settingReservedBudget &&
+                    (category === DataCategory.SPANS_INDEXED ||
+                      category === DataCategory.SEER_SCANNER);
+                  const suffix =
+                    settingReservedBudget &&
+                    (category === DataCategory.SPANS ||
+                      category === DataCategory.SEER_AUTOFIX)
+                      ? ` (${toTitleCase(
+                          Object.values(
+                            selectedPlan?.availableReservedBudgetTypes ?? {}
+                          ).find(budgetInfo =>
+                            budgetInfo.dataCategories.includes(category)
+                          )?.productName ?? ''
+                        )} ARR)`
+                      : '';
+                  const capitalizedApiName = this.capitalizeForApiName(
+                    categoryInfo.plural
+                  );
+                  return (
+                    <StyledDollarsField
+                      key={`customPrice${capitalizedApiName}`}
+                      label={`Price for ${titleName}${suffix}`}
+                      name={`customPrice${capitalizedApiName}`}
+                      disabled={!hasCustomSkuPrices || isDisabled}
+                      required={hasCustomSkuPrices}
+                      value={isDisabled ? 0 : data[`customPrice${capitalizedApiName}`]}
+                      onChange={v =>
+                        this.setState(state => ({
+                          ...state,
+                          data: {
+                            ...state.data,
+                            [`customPrice${capitalizedApiName}`]: v,
+                          },
+                        }))
                       }
-                      const titleName = getPlanCategoryName({
-                        plan: this.state.provisionablePlans[this.state.data.plan],
-                        category,
-                        title: true,
-                        hadCustomDynamicSampling: isAm3Ds,
-                      });
-                      const settingReservedBudget =
-                        this.isSettingReservedBudget(category);
-                      const isDisabled =
-                        settingReservedBudget &&
-                        (category === DataCategory.SPANS_INDEXED ||
-                          category === DataCategory.SEER_SCANNER);
-                      const suffix =
-                        settingReservedBudget &&
-                        (category === DataCategory.SPANS ||
-                          category === DataCategory.SEER_AUTOFIX)
-                          ? ` (${toTitleCase(
-                              Object.values(
-                                this.state.provisionablePlans[this.state.data.plan]
-                                  ?.availableReservedBudgetTypes ?? {}
-                              ).find(budgetInfo =>
-                                budgetInfo.dataCategories.includes(category)
-                              )?.productName ?? ''
-                            )} ARR)`
-                          : '';
-                      const capitalizedApiName = this.capitalizeForApiName(
-                        categoryInfo.plural
-                      );
-                      return (
-                        <StyledDollarsField
-                          key={`customPrice${capitalizedApiName}`}
-                          label={`Price for ${titleName}${suffix}`}
-                          name={`customPrice${capitalizedApiName}`}
-                          disabled={!hasCustomSkuPrices || isDisabled}
-                          required={hasCustomSkuPrices}
-                          value={
-                            isDisabled ? 0 : data[`customPrice${capitalizedApiName}`]
-                          }
-                          onChange={v =>
-                            this.setState(state => ({
-                              ...state,
-                              data: {
-                                ...state.data,
-                                [`customPrice${capitalizedApiName}`]: v,
-                              },
-                            }))
-                          }
-                        />
-                      );
-                    }
-                  )}
+                    />
+                  );
+                })}
                 <StyledDollarsField
                   label="Price for PCSS"
                   name="customPricePcss"
diff --git a/static/gsAdmin/views/customerDetails.tsx b/static/gsAdmin/views/customerDetails.tsx
index 8cea5088ce22fe..c316a66f9f8dca 100644
--- a/static/gsAdmin/views/customerDetails.tsx
+++ b/static/gsAdmin/views/customerDetails.tsx
@@ -596,6 +596,7 @@ export default function CustomerDetails() {
           {
             key: 'changeDates',
             name: 'Change Dates',
+            // TODO(billing): Should we start calling On-Demand periods "Pay-as-you-go" periods?
             help: 'Change the contract and on-demand period dates.',
             skipConfirmModal: true,
             visible: hasAdminTestFeatures,
diff --git a/static/gsApp/components/crons/cronsBillingBanner.spec.tsx b/static/gsApp/components/crons/cronsBillingBanner.spec.tsx
index 35ed9046de9cde..26652d56484c9d 100644
--- a/static/gsApp/components/crons/cronsBillingBanner.spec.tsx
+++ b/static/gsApp/components/crons/cronsBillingBanner.spec.tsx
@@ -91,7 +91,7 @@ describe('CronsBillingBanner', () => {
     expect(mockApiCall).toHaveBeenCalled();
     expect(
       await screen.findByText(
-        "Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please ask your organization's owner or billing manager to set up an on-demand budget for cron monitoring."
+        "Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please ask your organization's owner or billing manager to set up on-demand for cron monitoring."
       )
     ).toBeInTheDocument();
 
diff --git a/static/gsApp/components/crons/cronsBillingBanner.tsx b/static/gsApp/components/crons/cronsBillingBanner.tsx
index 147b8cfe58a419..9425380d198e8e 100644
--- a/static/gsApp/components/crons/cronsBillingBanner.tsx
+++ b/static/gsApp/components/crons/cronsBillingBanner.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 
 import {Alert} from 'sentry/components/core/alert';
-import {t, tct, tn} from 'sentry/locale';
+import {tct, tn} from 'sentry/locale';
 import type {Organization} from 'sentry/types/organization';
 import getDaysSinceDate from 'sentry/utils/getDaysSinceDate';
 import {useApiQuery} from 'sentry/utils/queryClient';
@@ -12,8 +12,13 @@ import {
 } from 'getsentry/components/crons/cronsBannerUpgradeCTA';
 import withSubscription from 'getsentry/components/withSubscription';
 import {useBillingConfig} from 'getsentry/hooks/useBillingConfig';
-import type {BillingConfig, MonitorCountResponse, Subscription} from 'getsentry/types';
-import {getTrialDaysLeft} from 'getsentry/utils/billing';
+import type {
+  BillingConfig,
+  MonitorCountResponse,
+  Plan,
+  Subscription,
+} from 'getsentry/types';
+import {displayBudgetName, getTrialDaysLeft} from 'getsentry/utils/billing';
 
 interface Props {
   organization: Organization;
@@ -53,7 +58,7 @@ export function CronsBillingBanner({organization, subscription}: Props) {
     return null;
   }
 
-  // Show alert for when we have disabled all monitors due to insufficient on-demand
+  // Show alert for when we have disabled all monitors due to insufficient PAYG
   if (
     data.enabledMonitorCount === 0 &&
     data.overQuotaMonitorCount > 0 &&
@@ -84,13 +89,18 @@ export function CronsBillingBanner({organization, subscription}: Props) {
     );
   }
 
-  // If the user's trial has ended and they aren't on a plan with on-demand
+  // If the user's trial has ended and they aren't on a plan with PAYG
   if (
     daysSinceTrial >= 0 &&
     daysSinceTrial <= 7 &&
     !subscription.planDetails.allowOnDemand
   ) {
-    return <TrialEndedBanner hasBillingAccess={hasBillingAccess} />;
+    return (
+      <TrialEndedBanner
+        hasBillingAccess={hasBillingAccess}
+        plan={subscription.planDetails}
+      />
+    );
   }
 
   return null;
@@ -131,15 +141,17 @@ function TrialEndingBanner({
   );
 }
 
-function TrialEndedBanner({hasBillingAccess}: BannerProps) {
+function TrialEndedBanner({hasBillingAccess, plan}: BannerProps & {plan: Plan}) {
   return (
     <TrialBanner hasBillingAccess={hasBillingAccess}>
       {hasBillingAccess
-        ? t(
-            'Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please increase your on-demand budget.'
+        ? tct(
+            'Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please increase your [budgetTerm].',
+            {budgetTerm: displayBudgetName(plan, {withBudget: true})}
           )
-        : t(
-            "Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please ask your organization's owner or billing manager to set up an on-demand budget for cron monitoring."
+        : tct(
+            "Your free business trial has ended. One cron job monitor is included in your current plan. If you want to monitor more than one cron job, please ask your organization's owner or billing manager to set up [budgetTerm] for cron monitoring.",
+            {budgetTerm: displayBudgetName(plan)}
           )}
     </TrialBanner>
   );
diff --git a/static/gsApp/components/cronsOnDemandStepWarning.tsx b/static/gsApp/components/cronsOnDemandStepWarning.tsx
index f12e8729ebbd6a..96932934cc3d6a 100644
--- a/static/gsApp/components/cronsOnDemandStepWarning.tsx
+++ b/static/gsApp/components/cronsOnDemandStepWarning.tsx
@@ -28,7 +28,7 @@ export function CronsOnDemandStepWarning({
   let reserved: number | null | undefined;
   let cronsPrice: number | null | undefined;
   if (isEnterprise(activePlan.id)) {
-    // this can only be reached for enterprise customers with invoiced on-demand
+    // this can only be reached for enterprise customers with invoiced PAYG
     // we want to make sure we use their actual reserved amount and not the minimum
     // for enterprise plans
     reserved = subscription.categories[cronCategoryName]?.reserved;
diff --git a/static/gsApp/components/gsBanner.tsx b/static/gsApp/components/gsBanner.tsx
index b492081247124c..b07c3ead3c94a2 100644
--- a/static/gsApp/components/gsBanner.tsx
+++ b/static/gsApp/components/gsBanner.tsx
@@ -722,7 +722,7 @@ class GSBanner extends Component<Props, State> {
 
   get overageWarningActive(): Record<EventType, boolean> {
     const {subscription} = this.props;
-    // disable warnings if org has on-demand
+    // disable warnings if org has PAYG
     if (
       subscription.hasOverageNotificationsDisabled ||
       subscription.onDemandMaxSpend > 0
diff --git a/static/gsApp/components/profiling/alerts.tsx b/static/gsApp/components/profiling/alerts.tsx
index 4a5db0586d25f4..80c19f9b78a4fd 100644
--- a/static/gsApp/components/profiling/alerts.tsx
+++ b/static/gsApp/components/profiling/alerts.tsx
@@ -310,29 +310,27 @@ function ContinuousProfilingBetaAlertBannerInner({
       }
     >
       {subscription.isFree
-        ? isAm2Plan(subscription.plan)
-          ? tct(
-              '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require a on-demand budget after this date. To avoid disruptions, upgrade to a paid plan.',
-              {bold: <b />}
-            )
-          : tct(
-              '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require a pay-as-you-go budget after this date. To avoid disruptions, upgrade to a paid plan.',
-              {bold: <b />}
-            )
+        ? tct(
+            '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require a [budgetTerm] after this date. To avoid disruptions, upgrade to a paid plan.',
+            {
+              bold: <b />,
+              budgetTerm: displayBudgetName(subscription.planDetails, {withBudget: true}),
+            }
+          )
         : isEnterprise(subscription.plan)
           ? tct(
               '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. To avoid disruptions, contact your account manager before then to add it to your plan.',
               {bold: <b />}
             )
-          : isAm2Plan(subscription.plan)
-            ? tct(
-                '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require an on-demand budget after this date.',
-                {bold: <b />}
-              )
-            : tct(
-                '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require a pay-as-you-go budget after this date.',
-                {bold: <b />}
-              )}
+          : tct(
+              '[bold:Profiling Beta Ending Soon:] Your free access ends May 19, 2025. Profiling will require a [budgetTerm] after this date.',
+              {
+                bold: <b />,
+                budgetTerm: displayBudgetName(subscription.planDetails, {
+                  withBudget: true,
+                }),
+              }
+            )}
     </Alert>
   );
 }
diff --git a/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx b/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx
index 46b11d9c53e2f0..dfe90bce224152 100644
--- a/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx
+++ b/static/gsApp/views/amCheckout/billingCycleSelectCard.tsx
@@ -74,7 +74,7 @@ function BillingCycleSelectCard({
     ? tct('[budgetTerm] usage billed monthly, discount does not apply', {
         budgetTerm:
           plan.budgetTerm === 'pay-as-you-go'
-            ? 'PAYG'
+            ? displayBudgetName(plan, {abbreviated: true})
             : displayBudgetName(plan, {title: true}),
       })
     : t('Cancel anytime');
diff --git a/static/gsApp/views/amCheckout/cartDiff.tsx b/static/gsApp/views/amCheckout/cartDiff.tsx
index 773b2aadf09961..39f8434c02ad7e 100644
--- a/static/gsApp/views/amCheckout/cartDiff.tsx
+++ b/static/gsApp/views/amCheckout/cartDiff.tsx
@@ -21,7 +21,11 @@ import {
   type SharedOnDemandBudget,
   type Subscription,
 } from 'getsentry/types';
-import {formatReservedWithUnits, isNewPayingCustomer} from 'getsentry/utils/billing';
+import {
+  displayBudgetName,
+  formatReservedWithUnits,
+  isNewPayingCustomer,
+} from 'getsentry/utils/billing';
 import {getPlanCategoryName} from 'getsentry/utils/dataCategory';
 import type {CheckoutFormData} from 'getsentry/views/amCheckout/types';
 import * as utils from 'getsentry/views/amCheckout/utils';
@@ -210,9 +214,14 @@ function OnDemandDiff({
               if (index === 0) {
                 leftComponent = (
                   <ChangeSectionTitle>
-                    {newPlan.budgetTerm === 'pay-as-you-go'
-                      ? t('PAYG spend limit')
-                      : t('Shared spend limit')}
+                    {tct('[budgetTerm] spend limit', {
+                      budgetTerm: displayBudgetName(
+                        newPlan,
+                        newPlan.budgetTerm === 'pay-as-you-go'
+                          ? {abbreviated: true}
+                          : {title: true}
+                      ),
+                    })}
                   </ChangeSectionTitle>
                 );
               }
diff --git a/static/gsApp/views/amCheckout/checkoutOverview.tsx b/static/gsApp/views/amCheckout/checkoutOverview.tsx
index 092c67089ce663..cfbf6ae4712014 100644
--- a/static/gsApp/views/amCheckout/checkoutOverview.tsx
+++ b/static/gsApp/views/amCheckout/checkoutOverview.tsx
@@ -18,7 +18,7 @@ import type {
   Subscription,
 } from 'getsentry/types';
 import {OnDemandBudgetMode} from 'getsentry/types';
-import {formatReservedWithUnits} from 'getsentry/utils/billing';
+import {displayBudgetName, formatReservedWithUnits} from 'getsentry/utils/billing';
 import {getPlanCategoryName} from 'getsentry/utils/dataCategory';
 import formatCurrency from 'getsentry/utils/formatCurrency';
 import {
@@ -156,19 +156,21 @@ class CheckoutOverview extends Component<Props> {
       return null;
     }
 
-    let title = t('On-Demand');
+    let prefix = '';
 
     if (displayNewOnDemandBudgetsUI) {
       if (onDemandBudget) {
         if (onDemandBudget.budgetMode === OnDemandBudgetMode.SHARED) {
-          title = t('Shared On-Demand');
+          prefix = t('Shared ');
         }
         if (onDemandBudget.budgetMode === OnDemandBudgetMode.PER_CATEGORY) {
-          title = t('Per-Category On-Demand');
+          prefix = t('Per-Category ');
         }
       }
     }
 
+    const title = `${prefix}${displayBudgetName(activePlan, {title: true})}`;
+
     const details: React.ReactNode[] = [];
 
     if (
@@ -328,13 +330,14 @@ class CheckoutOverview extends Component<Props> {
             </TotalPrice>
             {onDemandBudget && getTotalBudget(onDemandBudget) > 0 ? (
               <OnDemandAdditionalCost data-test-id="on-demand-additional-cost">
-                {tct('+ On-Demand charges up to [amount][break] based on usage', {
+                {tct('+ [budgetTerm] charges up to [amount][break] based on usage', {
+                  budgetTerm: displayBudgetName(activePlan, {title: true}),
                   amount: `${formatCurrency(getTotalBudget(onDemandBudget))}/mo`,
                   break: <br />,
                 })}
               </OnDemandAdditionalCost>
             ) : (
-              // Placeholder to avoid jumping when on-demand charges are added
+              // Placeholder to avoid jumping when PAYG charges are added
               <div style={{height: 33}} />
             )}
           </div>
diff --git a/static/gsApp/views/amCheckout/checkoutOverviewV2.tsx b/static/gsApp/views/amCheckout/checkoutOverviewV2.tsx
index 5b7d9decdf1624..bea7a92fd01460 100644
--- a/static/gsApp/views/amCheckout/checkoutOverviewV2.tsx
+++ b/static/gsApp/views/amCheckout/checkoutOverviewV2.tsx
@@ -16,6 +16,7 @@ import {toTitleCase} from 'sentry/utils/string/toTitleCase';
 import {PAYG_BUSINESS_DEFAULT, PAYG_TEAM_DEFAULT} from 'getsentry/constants';
 import type {BillingConfig, Plan, Promotion, Subscription} from 'getsentry/types';
 import {
+  displayBudgetName,
   formatReservedWithUnits,
   getReservedBudgetCategoryForAddOn,
   isBizPlanFamily,
@@ -83,7 +84,12 @@ function CheckoutOverviewV2({activePlan, formData, onUpdate: _onUpdate}: Props)
         <Subtitle>{t('Additional Coverage')}</Subtitle>
         <SpaceBetweenRow style={{alignItems: 'start'}}>
           <Column>
-            <Title>{t('Pay-as-you-go (PAYG) Budget')}</Title>
+            <Title>
+              {tct('[budgetTerm] ([abbreviation]) Budget', {
+                budgetTerm: displayBudgetName(activePlan, {title: true}),
+                abbreviation: displayBudgetName(activePlan, {abbreviated: true}),
+              })}
+            </Title>
             <Description>
               {t('Charges are applied at the end of your monthly usage cycle.')}
             </Description>
@@ -259,11 +265,12 @@ function CheckoutOverviewV2({activePlan, formData, onUpdate: _onUpdate}: Props)
                       <QuestionTooltip
                         size="xs"
                         title={t(
-                          "%s use your pay-as-you-go budget. You'll only be charged for actual usage.",
+                          "%s use your %s. You'll only be charged for actual usage.",
                           getPlanCategoryName({
                             plan: activePlan,
                             category,
-                          })
+                          }),
+                          displayBudgetName(activePlan, {withBudget: true})
                         )}
                       />
                     ) : null}
@@ -330,7 +337,8 @@ function CheckoutOverviewV2({activePlan, formData, onUpdate: _onUpdate}: Props)
                     <QuestionTooltip
                       size="xs"
                       title={t(
-                        "This is your pay-as-you-go budget, which ensures continued monitoring after you've used up your reserved event volume. We'll only charge you for actual usage, so this is your maximum charge for overage."
+                        "This is your %s, which ensures continued monitoring after you've used up your reserved event volume. We'll only charge you for actual usage, so this is your maximum charge for overage.",
+                        displayBudgetName(activePlan, {withBudget: true})
                       )}
                     />
                   </AdditionalMonthlyCharge>
diff --git a/static/gsApp/views/amCheckout/steps/addDataVolume.tsx b/static/gsApp/views/amCheckout/steps/addDataVolume.tsx
index e3e2dcfe55142e..5307952036d98d 100644
--- a/static/gsApp/views/amCheckout/steps/addDataVolume.tsx
+++ b/static/gsApp/views/amCheckout/steps/addDataVolume.tsx
@@ -11,7 +11,7 @@ import {t, tct} from 'sentry/locale';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
 
 import {PlanTier} from 'getsentry/types';
-import {isAmPlan} from 'getsentry/utils/billing';
+import {displayBudgetName, isAmPlan} from 'getsentry/utils/billing';
 import trackGetsentryAnalytics from 'getsentry/utils/trackGetsentryAnalytics';
 import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import VolumeSliders from 'getsentry/views/amCheckout/steps/volumeSliders';
@@ -83,7 +83,8 @@ function AddDataVolume({
     <StepFooter isLegacy={isLegacy} data-test-id={`${testId}-footer`}>
       {isLegacy && (
         <div>
-          {tct('Need more data? Add On-Demand Budget, or [link:Contact Sales]', {
+          {tct('Need more data? Add [budgetTerm], or [link:Contact Sales]', {
+            budgetTerm: displayBudgetName(activePlan, {title: true, withBudget: true}),
             link: <a href="mailto:sales@sentry.io" />,
           })}
         </div>
diff --git a/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx b/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx
index 90b0e5fc842066..1829d920729514 100644
--- a/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx
+++ b/static/gsApp/views/amCheckout/steps/onDemandBudgets.tsx
@@ -10,7 +10,7 @@ import {space} from 'sentry/styles/space';
 
 import type {OnDemandBudgets} from 'getsentry/types';
 import {OnDemandBudgetMode} from 'getsentry/types';
-import {isDeveloperPlan} from 'getsentry/utils/billing';
+import {displayBudgetName, isDeveloperPlan} from 'getsentry/utils/billing';
 import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
 import {getReservedPriceCents} from 'getsentry/views/amCheckout/utils';
@@ -24,10 +24,10 @@ import {
 type Props = StepProps;
 
 type State = {
-  // Once the on-demand budget is updated, we no longer suggest a new default on-demand value,
+  // Once the PAYG budget is updated, we no longer suggest a new default PAYG value,
   // regardless of whether there are further changes in the reserved value.
   // This is because if the user has seen and updated or clicked "Continue",
-  // that is considered the final on-demand value unless the user updates the value themselves.
+  // that is considered the final PAYG value unless the user updates the value themselves.
   isUpdated: boolean;
 };
 
@@ -40,7 +40,12 @@ class OnDemandBudgetsStep extends Component<Props> {
   state: State;
 
   get title() {
-    return t('On-Demand Budgets');
+    const {activePlan} = this.props;
+    return displayBudgetName(activePlan, {
+      title: true,
+      withBudget: true,
+      pluralOndemand: true,
+    });
   }
 
   setBudgetMode = (nextMode: OnDemandBudgetMode) => {
@@ -123,9 +128,13 @@ class OnDemandBudgetsStep extends Component<Props> {
     return (
       <StepFooter data-test-id={this.title}>
         <div>
-          {tct('Need more info? [link:See on-demand pricing chart]', {
+          {tct('Need more info? [link]', {
             link: (
-              <ExternalLink href="https://docs.sentry.io/pricing/legacy-pricing/#per-category-pricing" />
+              <ExternalLink href="https://docs.sentry.io/pricing/legacy-pricing/#per-category-pricing">
+                {tct('See [budgetTerm] pricing chart', {
+                  budgetTerm: displayBudgetName(this.props.activePlan),
+                })}
+              </ExternalLink>
             ),
           })}
         </div>
diff --git a/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx b/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx
index e659f61448c081..abb17a6d7aa796 100644
--- a/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx
+++ b/static/gsApp/views/amCheckout/steps/onDemandSpend.spec.tsx
@@ -100,7 +100,7 @@ describe('OnDemandSpend', () => {
     await openPanel();
 
     expect(screen.getByRole('textbox', {name: 'Monthly Max'})).toBeEnabled();
-    expect(screen.queryByLabelText(/On-demand is not supported/)).not.toBeInTheDocument();
+    expect(screen.queryByLabelText(/On-Demand is not supported/)).not.toBeInTheDocument();
     expect(screen.getByPlaceholderText('e.g. 50')).toBeInTheDocument();
 
     // Can type into the input.
@@ -178,7 +178,7 @@ describe('OnDemandSpend', () => {
 
     // Check tooltip
     await userEvent.hover(screen.getByRole('textbox', {name: 'Monthly Max'}));
-    expect(await screen.findByText(/On-demand is not supported/)).toBeInTheDocument();
+    expect(await screen.findByText(/On-Demand is not supported/)).toBeInTheDocument();
 
     const input = screen.getByRole('textbox', {name: 'Monthly Max'});
     expect(input).toBeInTheDocument();
@@ -194,7 +194,7 @@ describe('OnDemandSpend', () => {
 
     // Check tooltip
     await userEvent.hover(screen.getByRole('textbox', {name: 'Monthly Max'}));
-    expect(await screen.findByText(/On-demand is not supported/)).toBeInTheDocument();
+    expect(await screen.findByText(/On-Demand is not supported/)).toBeInTheDocument();
 
     const input = screen.getByRole('textbox', {name: 'Monthly Max'});
     expect(input).toBeInTheDocument();
diff --git a/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx b/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx
index c986f53e286c00..b8365a0e89324e 100644
--- a/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx
+++ b/static/gsApp/views/amCheckout/steps/onDemandSpend.tsx
@@ -11,6 +11,7 @@ import {t, tct} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import TextBlock from 'sentry/views/settings/components/text/textBlock';
 
+import {displayBudgetName} from 'getsentry/utils/billing';
 import {listDisplayNames} from 'getsentry/utils/dataCategory';
 import StepHeader from 'getsentry/views/amCheckout/steps/stepHeader';
 import type {StepProps} from 'getsentry/views/amCheckout/types';
@@ -41,7 +42,7 @@ function OnDemandSpend({
   const onDemandDollars = isNaN(dollars) ? '' : dollars.toString();
 
   const disabled = !(activePlan.allowOnDemand && subscription.supportsOnDemand);
-  const title = t('On-Demand Max Spend');
+  const title = t('%s Max Spend', displayBudgetName(activePlan, {title: true}));
   const oxfordCategories = listDisplayNames({
     plan: activePlan,
     categories: activePlan.checkoutCategories,
@@ -63,9 +64,12 @@ function OnDemandSpend({
             <Header>
               <div>{title}</div>
               <Description>
-                {t(
-                  "On-Demand spend allows you to pay for additional data beyond your subscription's reserved event volume. Applies to %s.",
-                  oxfordCategories
+                {tct(
+                  "[budgetTerm] spend allows you to pay for additional data beyond your subscription's reserved event volume. Applies to [oxfordCategories].",
+                  {
+                    budgetTerm: displayBudgetName(activePlan, {title: true}),
+                    oxfordCategories,
+                  }
                 )}
               </Description>
             </Header>
@@ -73,7 +77,9 @@ function OnDemandSpend({
               <InputHeader>{t('Monthly Max')}</InputHeader>
               <Tooltip
                 disabled={!disabled}
-                title={t('On-demand is not supported for your account.')}
+                title={tct('[budgetTerm] is not supported for your account.', {
+                  budgetTerm: displayBudgetName(activePlan, {title: true}),
+                })}
                 data-test-id="ondemand-disabled-tooltip"
               >
                 <Currency>
@@ -102,9 +108,13 @@ function OnDemandSpend({
       {isActive && (
         <StepFooter data-test-id={title}>
           <div>
-            {tct('Need more info? [link:See on-demand pricing chart]', {
+            {tct('Need more info? [link]', {
               link: (
-                <ExternalLink href="https://docs.sentry.io/pricing/legacy-pricing/#per-category-pricing" />
+                <ExternalLink href="https://docs.sentry.io/pricing/legacy-pricing/#per-category-pricing">
+                  {tct('See [budgetTerm] pricing chart', {
+                    budgetTerm: displayBudgetName(activePlan),
+                  })}
+                </ExternalLink>
               ),
             })}
           </div>
diff --git a/static/gsApp/views/onDemandBudgets/index.tsx b/static/gsApp/views/onDemandBudgets/index.tsx
index 7817aa42874937..0823f8750eb974 100644
--- a/static/gsApp/views/onDemandBudgets/index.tsx
+++ b/static/gsApp/views/onDemandBudgets/index.tsx
@@ -43,11 +43,9 @@ class OnDemandBudgets extends Component<Props> {
         })}
         <Tooltip
           title={t(
-            `%s you to pay for additional data beyond your subscription's
+            `%s allows you to pay for additional data beyond your subscription's
                 reserved quotas. %s is billed monthly at the end of each usage period.`,
-            subscription.planDetails.budgetTerm === 'pay-as-you-go'
-              ? 'Pay-as-you-go allows'
-              : 'On-Demand budgets allow',
+            displayBudgetName(subscription.planDetails, {title: true}),
             displayBudgetName(subscription.planDetails, {title: true})
           )}
           skipWrapper
@@ -227,17 +225,16 @@ class OnDemandBudgets extends Component<Props> {
       onDemandBudgets.budgetMode === OnDemandBudgetMode.SHARED &&
       onDemandBudgets.sharedMaxBudget > 0
     ) {
-      const budgetType = subscription.planDetails.budgetTerm;
-      description =
-        budgetType === 'pay-as-you-go'
-          ? t(
-              'Your pay-as-you-go budget is shared among all categories on a first come, first serve basis. There are no restrictions for any single category consuming the entire budget.'
-            )
-          : t(
-              'Your on-demand budget is shared among all categories on a first come, first serve basis. There are no restrictions for any single category consuming the entire budget.'
-            );
+      description = t(
+        'Your %s is shared among all categories on a first come, first serve basis. There are no restrictions for any single category consuming the entire budget.',
+        displayBudgetName(subscription.planDetails, {withBudget: true})
+      );
     } else if (onDemandBudgets.budgetMode === OnDemandBudgetMode.PER_CATEGORY) {
-      description = t('You have dedicated on-demand budget for %s.', oxfordCategories);
+      description = t(
+        'You have dedicated %s for %s.',
+        displayBudgetName(subscription.planDetails, {withBudget: true}),
+        oxfordCategories
+      );
     }
 
     const keepInline =
diff --git a/static/gsApp/views/onDemandBudgets/onDemandBudgetEdit.tsx b/static/gsApp/views/onDemandBudgets/onDemandBudgetEdit.tsx
index c9dab74f1af8fa..47ef33911b58f1 100644
--- a/static/gsApp/views/onDemandBudgets/onDemandBudgetEdit.tsx
+++ b/static/gsApp/views/onDemandBudgets/onDemandBudgetEdit.tsx
@@ -209,8 +209,9 @@ class OnDemandBudgetEdit extends Component<Props> {
           {activePlan.onDemandCategories.length !== perCategoryCategories.length && (
             <Alert type="warning">
               {tct(
-                'Additional [oxfordCategories] usage [isOrAre] only available through a shared on-demand budget. To enable on-demand usage switch to a shared on-demand budget.',
+                'Additional [oxfordCategories] usage [isOrAre] only available through a shared [budgetTerm] budget. To enable [budgetTerm] usage switch to a shared [budgetTerm] budget.',
                 {
+                  budgetTerm: displayBudgetName(activePlan),
                   isOrAre: nonPerCategory.length === 1 ? t('is') : t('are'),
                   oxfordCategories: oxfordizeArray(nonPerCategory),
                 }
@@ -292,8 +293,11 @@ class OnDemandBudgetEdit extends Component<Props> {
                         )}
                     </Title>
                     <Description>
-                      {t(
-                        'The on-demand budget is shared among all categories on a first come, first serve basis. There are no restrictions for any single category consuming the entire budget.'
+                      {tct(
+                        'The [budgetTerm] is shared among all categories on a first come, first serve basis. There are no restrictions for any single category consuming the entire budget.',
+                        {
+                          budgetTerm: displayBudgetName(activePlan),
+                        }
                       )}
                     </Description>
                     {this.renderInputFields(OnDemandBudgetMode.SHARED)}
@@ -328,9 +332,12 @@ class OnDemandBudgetEdit extends Component<Props> {
                         )}
                     </Title>
                     <Description>
-                      {t(
-                        'Dedicated on-demand budget for %s. Any overages in one category will not consume the budget of another category.',
-                        perCategoryCategories
+                      {tct(
+                        'Dedicated [budgetTerm] for [perCategoryCategories]. Any overages in one category will not consume the budget of another category.',
+                        {
+                          budgetTerm: displayBudgetName(activePlan, {withBudget: true}),
+                          perCategoryCategories,
+                        }
                       )}
                     </Description>
                     {this.renderInputFields(OnDemandBudgetMode.PER_CATEGORY)}
diff --git a/static/gsApp/views/onDemandBudgets/onDemandBudgetEditModal.tsx b/static/gsApp/views/onDemandBudgets/onDemandBudgetEditModal.tsx
index 11cd88f068faed..6a06caa83ebb3a 100644
--- a/static/gsApp/views/onDemandBudgets/onDemandBudgetEditModal.tsx
+++ b/static/gsApp/views/onDemandBudgets/onDemandBudgetEditModal.tsx
@@ -13,7 +13,12 @@ import type {Organization} from 'sentry/types/organization';
 import withApi from 'sentry/utils/withApi';
 
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
-import type {OnDemandBudgetMode, OnDemandBudgets, Subscription} from 'getsentry/types';
+import type {
+  OnDemandBudgetMode,
+  OnDemandBudgets,
+  Plan,
+  Subscription,
+} from 'getsentry/types';
 import {displayBudgetName, hasNewBillingUI} from 'getsentry/utils/billing';
 
 import OnDemandBudgetEdit from './onDemandBudgetEdit';
@@ -26,14 +31,22 @@ import {
   trackOnDemandBudgetAnalytics,
 } from './utils';
 
-const ONDEMAND_BUDGET_SAVE_ERROR = t('Unable to save your on-demand budgets.');
-const PAYG_BUDGET_SAVE_ERROR = t('Unable to save your pay-as-you-go budget.');
-const ONDEMAND_BUDGET_EXCEEDS_INVOICED_LIMIT = t(
-  'Your on-demand budget cannot exceed 5 times your monthly plan price.'
-);
-const PAYG_BUDGET_EXCEEDS_INVOICED_LIMIT = t(
-  'Your pay-as-you-go budget cannot exceed 5 times your monthly plan price.'
-);
+function getBudgetSaveError(plan: Plan) {
+  return t(
+    'Unable to save your %s',
+    displayBudgetName(plan, {
+      pluralOndemand: true,
+      withBudget: true,
+    })
+  );
+}
+
+function getBudgetExceededInvoicedLimitError(plan: Plan) {
+  return t(
+    'Your %s cannot exceed 5 times your monthly plan price.',
+    displayBudgetName(plan, {withBudget: true})
+  );
+}
 
 type Props = {
   api: Client;
@@ -79,7 +92,7 @@ class OnDemandBudgetEditModal extends Component<Props, State> {
       if (listOfErrors.length === 0) {
         return (
           <Alert system type="error">
-            {ONDEMAND_BUDGET_SAVE_ERROR}
+            {getBudgetSaveError(this.props.subscription.planDetails)}
           </Alert>
         );
       }
@@ -119,10 +132,7 @@ class OnDemandBudgetEditModal extends Component<Props, State> {
     const newOnDemandBudget = normalizeOnDemandBudget(this.state.onDemandBudget);
 
     if (exceedsInvoicedBudgetLimit(subscription, newOnDemandBudget)) {
-      const message =
-        subscription.planDetails.budgetTerm === 'pay-as-you-go'
-          ? PAYG_BUDGET_EXCEEDS_INVOICED_LIMIT
-          : ONDEMAND_BUDGET_EXCEEDS_INVOICED_LIMIT;
+      const message = getBudgetExceededInvoicedLimitError(subscription.planDetails);
       this.setState({
         updateError: message,
       });
@@ -166,18 +176,11 @@ class OnDemandBudgetEditModal extends Component<Props, State> {
       return true;
     } catch (response: any) {
       const updateError =
-        (response?.responseJSON ??
-        subscription.planDetails.budgetTerm === 'pay-as-you-go')
-          ? PAYG_BUDGET_SAVE_ERROR
-          : ONDEMAND_BUDGET_SAVE_ERROR;
+        response?.responseJSON ?? getBudgetSaveError(subscription.planDetails);
       this.setState({
         updateError,
       });
-      addErrorMessage(
-        subscription.planDetails.budgetTerm === 'pay-as-you-go'
-          ? PAYG_BUDGET_SAVE_ERROR
-          : ONDEMAND_BUDGET_SAVE_ERROR
-      );
+      addErrorMessage(getBudgetSaveError(subscription.planDetails));
       return false;
     }
   };
diff --git a/static/gsApp/views/onDemandBudgets/utils.tsx b/static/gsApp/views/onDemandBudgets/utils.tsx
index 07e1d7edef112c..eded8d4705714e 100644
--- a/static/gsApp/views/onDemandBudgets/utils.tsx
+++ b/static/gsApp/views/onDemandBudgets/utils.tsx
@@ -131,8 +131,8 @@ export function hasOnDemandBudgetsFeature(
   organization: undefined | Organization,
   subscription: undefined | Subscription
 ) {
-  // This function determines if the org can access the on-demand budgets UI.
-  // Only orgs on the AM plan can access the on-demand budgets UI.
+  // This function determines if the org can access the PAYG budgets UI.
+  // Only orgs on the AM plan can access the PAYG budgets UI.
   return (
     subscription?.planDetails?.hasOnDemandModes &&
     organization?.features.includes('ondemand-budgets')
@@ -154,7 +154,7 @@ export function exceedsInvoicedBudgetLimit(
     return false;
   }
 
-  // no limit for invoiced customers with CC-charged on-demand
+  // no limit for invoiced customers with CC-charged PAYG
   if (subscription.onDemandInvoiced && !subscription.onDemandInvoicedManual) {
     return false;
   }
diff --git a/static/gsApp/views/spendAllocations/rootAllocationCard.tsx b/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
index 9f1e3673d13b9d..2ff26b201d13db 100644
--- a/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
+++ b/static/gsApp/views/spendAllocations/rootAllocationCard.tsx
@@ -82,10 +82,10 @@ function RootAllocationCard({
               </Header>
               <Body>
                 {tct(
-                  `The un-allocated pool represents the remaining Reserved Volume available for your projects. Excess project consumption will first consume events from your un-allocated pool, and then from your [odLink] volume, if available`,
+                  `The un-allocated pool represents the remaining Reserved Volume available for your projects. Excess project consumption will first consume events from your un-allocated pool, and then from your [pricingLink] volume, if available`,
                   {
-                    odLink: (
-                      <ExternalLink href="https://docs.sentry.io/product/accounts/pricing/#on-demand-capacity">
+                    pricingLink: (
+                      <ExternalLink href="https://docs.sentry.io/pricing/">
                         {displayBudgetName(subscription.planDetails, {title: true})}
                       </ExternalLink>
                     ),
diff --git a/static/gsApp/views/subscriptionPage/onDemandSettings.tsx b/static/gsApp/views/subscriptionPage/onDemandSettings.tsx
index 00cb0eadaa2d4c..724ab9c193dad6 100644
--- a/static/gsApp/views/subscriptionPage/onDemandSettings.tsx
+++ b/static/gsApp/views/subscriptionPage/onDemandSettings.tsx
@@ -114,7 +114,7 @@ export function OnDemandSettings({subscription, organization}: OnDemandSettingsP
           <EditOnDemandButton organization={organization} subscription={subscription} />
         )}
       </PanelHeader>
-      {/* AM3 doesn't have on-demand-budgets, but we want them to see the newer ui  */}
+      {/* AM3 doesn't have PAYG budget modes, but we want them to see the newer ui  */}
       {hasOndemandBudgets || subscription.planTier === PlanTier.AM3 ? (
         <OnDemandBudgets
           onDemandEnabled={onDemandEnabled}
diff --git a/static/gsApp/views/subscriptionPage/onDemandSummary.tsx b/static/gsApp/views/subscriptionPage/onDemandSummary.tsx
index 004ef8af2eefd1..32290d173fa7cc 100644
--- a/static/gsApp/views/subscriptionPage/onDemandSummary.tsx
+++ b/static/gsApp/views/subscriptionPage/onDemandSummary.tsx
@@ -21,7 +21,7 @@ import {openEditCreditCard} from 'getsentry/actionCreators/modal';
 import OnDemandPrice from 'getsentry/components/onDemandPrice';
 import SubscriptionStore from 'getsentry/stores/subscriptionStore';
 import type {Subscription} from 'getsentry/types';
-import {hasPerformance} from 'getsentry/utils/billing';
+import {displayBudgetName, hasPerformance} from 'getsentry/utils/billing';
 import {listDisplayNames} from 'getsentry/utils/dataCategory';
 
 function coerceValue(value: number): number {
@@ -98,34 +98,45 @@ class OnDemandSummary extends Component<Props, State> {
     this.setState({initialValue: value});
   };
 
-  renderLabel = () => (
-    <Label>
-      {t('On-Demand Max Spend')}
-      <Tooltip
-        title={t(
-          `On-Demand spend allows you to pay for additional data beyond your subscription's
-  reserved event volume. Billed monthly at the end of the usage period.`
-        )}
-      >
-        <LinkButton
-          priority="link"
-          href="https://docs.sentry.io/pricing/legacy-pricing/#on-demand-volume"
-          icon={<IconQuestion size="xs" />}
-          size="sm"
-          external
-          aria-label={t('Visit docs')}
-        />
-      </Tooltip>
-    </Label>
-  );
+  renderLabel = () => {
+    const {planDetails} = this.props.subscription;
+    return (
+      <Label>
+        {tct('[budgetTerm] Max Spend', {
+          budgetTerm: displayBudgetName(planDetails, {title: true}),
+        })}
+        <Tooltip
+          title={tct(
+            `[budgetTerm] spend allows you to pay for additional data beyond your subscription's
+  reserved event volume. Billed monthly at the end of the usage period.`,
+            {
+              budgetTerm: displayBudgetName(planDetails, {title: true}),
+            }
+          )}
+        >
+          <LinkButton
+            priority="link"
+            href="https://docs.sentry.io/pricing/legacy-pricing/#on-demand-volume"
+            icon={<IconQuestion size="xs" />}
+            size="sm"
+            external
+            aria-label={t('Visit docs')}
+          />
+        </Tooltip>
+      </Label>
+    );
+  };
 
   renderNotEnabled() {
     const {organization} = this.props;
+    const {planDetails} = this.props.subscription;
 
     return (
       <FieldGroup
         label={this.renderLabel()}
-        help={t('On-Demand is not supported for your account.')}
+        help={tct('[budgetTerm] is not supported for your account.', {
+          budgetTerm: displayBudgetName(planDetails, {title: true}),
+        })}
       >
         <div>
           <LinkButton to={`/settings/${organization.slug}/support/`}>
@@ -138,11 +149,17 @@ class OnDemandSummary extends Component<Props, State> {
 
   renderNeedsPaymentSource() {
     const {organization, subscription} = this.props;
+    const {planDetails} = subscription;
 
     return (
       <FieldGroup
         label={this.renderLabel()}
-        help={t("To enable on-demand spend, you'll need a valid credit card on file.")}
+        help={tct(
+          "To enable [budgetTerm] spend, you'll need a valid credit card on file.",
+          {
+            budgetTerm: displayBudgetName(planDetails),
+          }
+        )}
       >
         <div>
           <Button
@@ -216,6 +233,7 @@ class OnDemandSummary extends Component<Props, State> {
       subscription,
     } = this.props;
     const {initialValue, value} = this.state;
+    const {planDetails} = subscription;
 
     if (!enabled) {
       return this.renderNotEnabled();
@@ -227,7 +245,13 @@ class OnDemandSummary extends Component<Props, State> {
 
     return (
       <form className={enabled ? '' : 'disabled'} onSubmit={this.onSave}>
-        {withHeader && <PanelHeader>{t('On-Demand Max Spend')}</PanelHeader>}
+        {withHeader && (
+          <PanelHeader>
+            {tct('[budgetTerm] Max Spend', {
+              budgetTerm: displayBudgetName(planDetails, {title: true}),
+            })}
+          </PanelHeader>
+        )}
 
         {/* TODO(TS): Type says error might be an object */}
         {error && <PanelAlert type="error">{error as React.ReactNode}</PanelAlert>}
diff --git a/static/gsApp/views/subscriptionPage/ondemandDisabled.spec.tsx b/static/gsApp/views/subscriptionPage/ondemandDisabled.spec.tsx
index 3fb8d35680629d..731d11a4bfe8df 100644
--- a/static/gsApp/views/subscriptionPage/ondemandDisabled.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/ondemandDisabled.spec.tsx
@@ -35,7 +35,7 @@ describe('OnDemandDisabled', () => {
     expect(screen.queryByTestId('ondemand-disabled-alert')).not.toBeInTheDocument();
   });
 
-  it('renders alert for AM1 plan with on-demand terminology', () => {
+  it('renders alert for plan with on-demand terminology', () => {
     const subscription = SubscriptionFixture({
       organization,
       onDemandDisabled: true,
@@ -49,38 +49,18 @@ describe('OnDemandDisabled', () => {
     expect(
       screen.getByText(
         textWithMarkupMatcher(
-          'On-demand billing is disabled for your organization due to an unpaid on-demand invoice.'
+          'On-Demand billing is disabled for your organization due to an unpaid on-demand invoice.'
         )
       )
     ).toBeInTheDocument();
   });
 
-  it('renders alert for AM2 plan with on-demand terminology', () => {
+  it('renders alert for plan with pay-as-you-go terminology', () => {
     const subscription = SubscriptionFixture({
       organization,
       onDemandDisabled: true,
       onDemandMaxSpend: 1000,
-      planTier: PlanTier.AM2,
-    });
-
-    render(<OnDemandDisabled subscription={subscription} />);
-
-    expect(screen.getByTestId('ondemand-disabled-alert')).toBeInTheDocument();
-    expect(
-      screen.getByText(
-        textWithMarkupMatcher(
-          'On-demand billing is disabled for your organization due to an unpaid on-demand invoice.'
-        )
-      )
-    ).toBeInTheDocument();
-  });
-
-  it('renders alert for AM3 plan with pay-as-you-go terminology', () => {
-    const subscription = SubscriptionFixture({
-      organization,
-      onDemandDisabled: true,
-      onDemandMaxSpend: 1000,
-      planTier: PlanTier.AM3,
+      plan: 'am3_team',
     });
 
     render(<OnDemandDisabled subscription={subscription} />);
diff --git a/static/gsApp/views/subscriptionPage/ondemandDisabled.tsx b/static/gsApp/views/subscriptionPage/ondemandDisabled.tsx
index aa3a7764b04ab7..1a47247753704b 100644
--- a/static/gsApp/views/subscriptionPage/ondemandDisabled.tsx
+++ b/static/gsApp/views/subscriptionPage/ondemandDisabled.tsx
@@ -31,8 +31,8 @@ import {Alert} from 'sentry/components/core/alert';
 import {ExternalLink} from 'sentry/components/core/link';
 import {tct} from 'sentry/locale';
 
-import {PlanTier, type Subscription} from 'getsentry/types';
-import {isAmPlan} from 'getsentry/utils/billing';
+import {type Subscription} from 'getsentry/types';
+import {displayBudgetName} from 'getsentry/utils/billing';
 
 interface Props {
   subscription: Subscription;
@@ -44,28 +44,14 @@ function OnDemandDisabled({subscription}: Props) {
     return null;
   }
 
-  // Determine the appropriate terminology based on plan tier
-  const preAM3Tiers = [PlanTier.AM1, PlanTier.AM2];
-  const isPreAM3Tier = preAM3Tiers.includes(subscription.planTier as PlanTier);
-
-  const isAMTier = isAmPlan(subscription.planTier as PlanTier);
-
-  // Set display name based on plan tier:
-  // - "Pay-as-you-go" for AM3+ plans
-  // - "On-demand" for all other plans (including legacy AM1/AM2)
-  let name = 'On-demand';
-  if (isAMTier && !isPreAM3Tier) {
-    name = 'Pay-as-you-go';
-  }
-
   return (
     <Alert type="error" data-test-id="ondemand-disabled-alert" showIcon={false}>
       <span>
         {tct(
-          "[Name] billing is disabled for your organization due to an unpaid [lowercase_name] invoice. This may impact your organization's ability to accept data into Sentry. [docs_link:Learn more about this process].",
+          "[budgetTerm] billing is disabled for your organization due to an unpaid [lowerCaseBudgetTerm] invoice. This may impact your organization's ability to accept data into Sentry. [docs_link:Learn more about this process].",
           {
-            Name: name,
-            lowercase_name: name.toLowerCase(),
+            budgetTerm: displayBudgetName(subscription.planDetails, {title: true}),
+            lowerCaseBudgetTerm: displayBudgetName(subscription.planDetails),
             docs_link: (
               <ExternalLink href="https://sentry.zendesk.com/hc/en-us/articles/23622477256987-We-can-t-pay-our-on-demand-pay-as-you-go-invoice-and-have-an-annual-contract-What-happens" />
             ),
@@ -74,9 +60,9 @@ function OnDemandDisabled({subscription}: Props) {
       </span>{' '}
       <span>
         {tct(
-          'Please contact [contact_link:support@sentry.io] to pay [receipts_link:closed/outstanding invoices] to re-enable [lowercase_name] billing.',
+          'Please contact [contact_link:support@sentry.io] to pay [receipts_link:closed/outstanding invoices] to re-enable [budgetTerm] billing.',
           {
-            lowercase_name: name.toLowerCase(),
+            budgetTerm: displayBudgetName(subscription.planDetails),
             receipts_link: <NavLink to="/settings/billing/receipts/" />,
             contact_link: <a href="mailto:support@sentry.io" />,
           }
diff --git a/static/gsApp/views/subscriptionPage/overview.spec.tsx b/static/gsApp/views/subscriptionPage/overview.spec.tsx
index 0ade7e45fe47c7..9259fda3fdfd39 100644
--- a/static/gsApp/views/subscriptionPage/overview.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/overview.spec.tsx
@@ -871,106 +871,6 @@ describe('Subscription > Overview', () => {
     expect(screen.queryByText('Trial Available')).not.toBeInTheDocument();
   });
 
-  describe('OnDemandDisabled', () => {
-    it('renders alert when on-demand is disabled', async () => {
-      const subscription = SubscriptionFixture({
-        organization,
-        onDemandDisabled: true,
-        onDemandMaxSpend: 1000,
-      });
-      SubscriptionStore.set(organization.slug, subscription);
-
-      render(<Overview location={mockLocation} />, {organization});
-
-      expect(await screen.findByTestId('ondemand-disabled-alert')).toBeInTheDocument();
-      expect(
-        screen.getByText(
-          textWithMarkupMatcher(
-            'On-demand billing is disabled for your organization due to an unpaid on-demand invoice.'
-          )
-        )
-      ).toBeInTheDocument();
-    });
-
-    it('renders alert when on-demand is disabled with billing permissions', async () => {
-      const billingOrg = OrganizationFixture({access: ['org:billing']});
-      const subscription = SubscriptionFixture({
-        organization: billingOrg,
-        onDemandDisabled: true,
-        onDemandMaxSpend: 1000,
-      });
-      SubscriptionStore.set(billingOrg.slug, subscription);
-
-      render(<Overview location={mockLocation} />, {organization: billingOrg});
-
-      expect(await screen.findByTestId('ondemand-disabled-alert')).toBeInTheDocument();
-      expect(
-        screen.getByText(
-          textWithMarkupMatcher(
-            'On-demand billing is disabled for your organization due to an unpaid on-demand invoice.'
-          )
-        )
-      ).toBeInTheDocument();
-    });
-
-    it('renders alert when on-demand is disabled without billing permissions', async () => {
-      const nonBillingOrg = OrganizationFixture({access: []});
-      const subscription = SubscriptionFixture({
-        organization: nonBillingOrg,
-        onDemandDisabled: true,
-        onDemandMaxSpend: 1000,
-        canSelfServe: true,
-      });
-      SubscriptionStore.set(nonBillingOrg.slug, subscription);
-
-      render(<Overview location={mockLocation} />, {organization: nonBillingOrg});
-
-      expect(await screen.findByTestId('ondemand-disabled-alert')).toBeInTheDocument();
-      expect(
-        screen.getByText(
-          textWithMarkupMatcher(
-            'On-demand billing is disabled for your organization due to an unpaid on-demand invoice.'
-          )
-        )
-      ).toBeInTheDocument();
-    });
-
-    it('does not render alert when on-demand is not disabled', async () => {
-      const subscription = SubscriptionFixture({
-        organization,
-        onDemandDisabled: false,
-        onDemandMaxSpend: 1000,
-      });
-      SubscriptionStore.set(organization.slug, subscription);
-
-      render(<Overview location={mockLocation} />, {organization});
-
-      expect(await screen.findByText('Errors usage this period')).toBeInTheDocument();
-      expect(screen.queryByTestId('ondemand-disabled-alert')).not.toBeInTheDocument();
-    });
-
-    it('uses pay-as-you-go terminology for AM3 plans', async () => {
-      const subscription = SubscriptionFixture({
-        organization,
-        onDemandDisabled: true,
-        onDemandMaxSpend: 1000,
-        planTier: PlanTier.AM3,
-      });
-      SubscriptionStore.set(organization.slug, subscription);
-
-      render(<Overview location={mockLocation} />, {organization});
-
-      expect(await screen.findByTestId('ondemand-disabled-alert')).toBeInTheDocument();
-      expect(
-        screen.getByText(
-          textWithMarkupMatcher(
-            'Pay-as-you-go billing is disabled for your organization due to an unpaid pay-as-you-go invoice.'
-          )
-        )
-      ).toBeInTheDocument();
-    });
-  });
-
   it('renders breakdown for transactions only', async () => {
     // Set up AM2 subscription with profiling-billing feature
     const subscription = SubscriptionFixture({
diff --git a/static/gsApp/views/subscriptionPage/overview.tsx b/static/gsApp/views/subscriptionPage/overview.tsx
index e9ce2091d33de6..79789a1fd6a7c2 100644
--- a/static/gsApp/views/subscriptionPage/overview.tsx
+++ b/static/gsApp/views/subscriptionPage/overview.tsx
@@ -352,7 +352,7 @@ function Overview({location, subscription, promotionData}: Props) {
    *   - Receipts
    *   - Credit card on file
    *   - Previous usage history
-   *   - On-demand information
+   *   - On-demand/PAYG information
    */
   function contentWithBillingPerms(usageData: CustomerUsage, planDetails: Plan) {
     return (
diff --git a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
index fff14a4389be38..100a03a8547459 100644
--- a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
+++ b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
@@ -397,7 +397,7 @@ export function mapReservedBudgetStatsToChart({
             }
             // when cumulative, onDemand is the running total for the category
             // otherwise, onDemand is the amount used for the category for this date
-            // either way we need to add them together to get the on-demand amount across the categories
+            // either way we need to add them together to get the on-demand/PAYG amount across the categories
             onDemandForDate += onDemand;
           }
         });
diff --git a/static/gsApp/views/subscriptionPage/usageAlert.tsx b/static/gsApp/views/subscriptionPage/usageAlert.tsx
index c693ba1d30a615..78e83b60bb63a8 100644
--- a/static/gsApp/views/subscriptionPage/usageAlert.tsx
+++ b/static/gsApp/views/subscriptionPage/usageAlert.tsx
@@ -74,8 +74,8 @@ function UsageAlert({subscription, usage}: Props) {
   }
 
   function projectedCategoryOverages() {
-    // hide projected overages for plans with on-demand for now since
-    // shared on-demand budget can be applied to any data category
+    // hide projected overages for plans with on-demand/PAYG for now since
+    // shared on-demand/PAYG budget can be applied to any data category
     if (subscription.onDemandMaxSpend) {
       return [];
     }
diff --git a/static/gsApp/views/subscriptionPage/usageHistory.spec.tsx b/static/gsApp/views/subscriptionPage/usageHistory.spec.tsx
index faa5edeace8231..49aa93100105a7 100644
--- a/static/gsApp/views/subscriptionPage/usageHistory.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/usageHistory.spec.tsx
@@ -178,7 +178,7 @@ describe('Subscription > UsageHistory', () => {
 
     render(<UsageHistory {...RouteComponentPropsFixture()} />, {organization});
 
-    expect(screen.queryByText('On-demand Spend')).not.toBeInTheDocument();
+    expect(screen.queryByText('On-Demand Spend')).not.toBeInTheDocument();
     expect(mockCall).toHaveBeenCalled();
   });
 
diff --git a/static/gsApp/views/subscriptionPage/usageHistory.tsx b/static/gsApp/views/subscriptionPage/usageHistory.tsx
index e0e7d1176c4a94..e1ee62d73130f2 100644
--- a/static/gsApp/views/subscriptionPage/usageHistory.tsx
+++ b/static/gsApp/views/subscriptionPage/usageHistory.tsx
@@ -36,6 +36,7 @@ import type {
 import {OnDemandBudgetMode} from 'getsentry/types';
 import {
   convertUsageToReservedUnit,
+  displayBudgetName,
   formatReservedWithUnits,
   formatUsageWithUnits,
   getSoftCapType,
@@ -183,7 +184,7 @@ type RowProps = {
   subscription: Subscription;
 };
 
-function UsageHistoryRow({history, subscription}: RowProps) {
+function UsageHistoryRow({history}: RowProps) {
   const organization = useOrganization();
   const [expanded, setExpanded] = useState<boolean>(history.isCurrent);
 
@@ -227,11 +228,14 @@ function UsageHistoryRow({history, subscription}: RowProps) {
         <thead>
           <tr>
             <th>
-              {subscription.planDetails.budgetTerm === 'pay-as-you-go'
-                ? t('Pay-as-you-go Spend')
-                : history.onDemandBudgetMode === OnDemandBudgetMode.PER_CATEGORY
-                  ? t('On-Demand Spend (Per-Category)')
-                  : t('On-Demand Spend (Shared)')}
+              {tct('[budgetTerm] Spend[suffix]', {
+                budgetTerm: displayBudgetName(history.planDetails, {title: true}),
+                suffix: history.planDetails?.hasOnDemandModes
+                  ? history.onDemandBudgetMode === OnDemandBudgetMode.PER_CATEGORY
+                    ? ' (Per-Category)'
+                    : ' (Shared)'
+                  : '',
+              })}
             </th>
             <th>{t('Amount Spent')}</th>
             <th>{t('Maximum')}</th>