From ef174786ee5a240891df96a47089c00351a3330f Mon Sep 17 00:00:00 2001
From: Laura Coursen <lecoursen@github.com>
Date: Fri, 28 Jul 2023 09:31:53 +0100
Subject: [PATCH] Align billing terminology and provide high-level overview
 (#38305)

Co-authored-by: Robert Sese <734194+rsese@users.noreply.github.com>
---
 .../personalizing-your-profile.md             |   2 +-
 .../converting-a-user-into-an-organization.md |   4 +-
 .../using-environments-for-deployment.md      |   6 +-
 .../about-github-hosted-runners.md            |   4 +-
 .../about-larger-runners.md                   |   4 +-
 content/admin/index.md                        |   3 +-
 ...adding-organizations-to-your-enterprise.md |   2 +-
 .../roles-in-an-enterprise.md                 |   2 +-
 .../audit-log-events-for-your-enterprise.md   |   4 +-
 .../overview/about-enterprise-accounts.md     |   8 +-
 .../creating-an-enterprise-account.md         |   2 +-
 .../rate-limits-for-github-apps.md            |   2 +-
 content/billing/index.md                      |  25 ++--
 .../about-billing-for-github-actions.md       |   8 +-
 ...-your-spending-limit-for-github-actions.md |   2 +-
 .../about-billing-for-github-codespaces.md    |   2 +-
 ...he-spending-limit-for-github-codespaces.md |   2 +-
 .../about-billing-for-github-copilot.md       |   3 +-
 .../about-billing-for-github-packages.md      |   4 +-
 ...your-spending-limit-for-github-packages.md |   2 +-
 ...io-subscriptions-with-github-enterprise.md |   6 +-
 ...io-subscriptions-with-github-enterprise.md |   2 +-
 .../about-billing-for-plans.md}               |  19 +--
 .../about-per-user-pricing.md                 |  20 +--
 .../connecting-an-azure-subscription.md       |   9 +-
 .../discounted-plans-for-github-accounts.md}  |   9 +-
 .../downgrading-your-accounts-plan.md}        |  35 +++---
 ...-downgrading-affect-the-billing-process.md |   6 +-
 .../index.md                                  |  18 ++-
 .../managing-invoices-for-your-enterprise.md  |   6 +-
 ...ne-time-payments-for-customers-in-india.md |   0
 .../upgrading-your-accounts-plan.md}          |  33 ++---
 ...-managing-pending-changes-to-your-plan.md} |  20 +--
 ...n-and-usage-for-your-enterprise-account.md |   7 +-
 .../about-billing-for-your-enterprise.md      |  10 +-
 .../about-billing-on-github.md                | 116 +++++++++++++++---
 .../index.md                                  |   3 +
 .../unlocking-a-locked-account.md             |   2 +-
 ...ing-your-subscriptions-and-billing-date.md |   2 +-
 .../about-licenses-for-github-enterprise.md   |   2 +-
 ...ing-license-usage-for-github-enterprise.md |   4 +-
 ...nterprise-account-on-behalf-of-a-client.md |   2 +-
 ...r-an-organization-on-behalf-of-a-client.md |   4 +-
 ...ngrading-your-clients-paid-organization.md |   2 +-
 ...onfiguring-codeql-cli-in-your-ci-system.md |   8 +-
 .../github-security-features.md               |   2 +-
 ...-and-organization-for-github-codespaces.md |   2 +-
 .../configuring-prebuilds.md                  |   2 +-
 ...sing-markdown-and-liquid-in-github-docs.md |  13 +-
 .../writing-for-github-docs/style-guide.md    |   2 +-
 ...github-codespaces-with-github-classroom.md |   2 +-
 content/get-started/index.md                  |   2 +-
 .../about-github-advanced-security.md         |   2 +-
 .../about-versions-of-github-docs.md          |  12 +-
 .../faq-about-changes-to-githubs-plans.md     |   8 +-
 .../{githubs-products.md => githubs-plans.md} |  23 ++--
 .../learning-about-github/index.md            |   3 +-
 .../types-of-github-accounts.md               |   2 +-
 .../getting-started-with-github-ae.md         |   2 +-
 ...ng-started-with-github-enterprise-cloud.md |   2 +-
 ...g-started-with-github-enterprise-server.md |   2 +-
 ...etting-started-with-your-github-account.md |   2 +-
 ...g-up-a-trial-of-github-enterprise-cloud.md |   2 +-
 .../signing-up-for-a-new-github-account.md    |   2 +-
 .../get-started/using-github/github-mobile.md |   2 +-
 ...reating-a-new-organization-from-scratch.md |   2 +-
 .../audit-log-events-for-your-organization.md |   4 +-
 ...nviting-users-to-join-your-organization.md |   2 +-
 ...emoving-a-member-from-your-organization.md |   2 +-
 .../deleting-an-organization-account.md       |   2 +-
 ...-collaborator-to-an-organization-member.md |   2 +-
 ...llaborators-access-to-your-organization.md |   2 +-
 ...borator-from-an-organization-repository.md |   2 +-
 .../about-custom-domains-and-github-pages.md  |   2 +-
 .../archiving-repositories.md                 |   2 +-
 .../setting-repository-visibility.md          |   5 +-
 content/rest/scim/scim.md                     |   2 +-
 .../github-terms/github-terms-of-service.md   |   4 +-
 .../about-github-support.md                   |   1 -
 contributing/content-markup-reference.md      |   8 +-
 contributing/content-style-guide.md           |   2 +-
 data/learning-tracks/admin.yml                |   2 +-
 data/reusables/actions/actions-billing.md     |   2 +-
 .../actions-packages-set-spending-limit.md    |   2 +-
 data/reusables/billing/about-billing.md       |   1 +
 .../signup-procedure-enterprise-msft-ea.md    |   2 +-
 .../dotcom_billing/same-payment-method.md     |   2 +-
 data/reusables/education/apply-for-team.md    |   2 +-
 .../billing-azure-subscription.md             |   6 +-
 .../enterprise/about-deployment-methods.md    |   2 +-
 .../gated-features/code-review-assignment.md  |   2 +-
 .../gated-features/codespaces-org.md          |   2 +-
 .../gated-features/codespaces-repo.md         |   2 +-
 .../reusables/gated-features/display-names.md |   2 +-
 data/reusables/gated-features/ghas-ghec.md    |   2 +-
 data/reusables/gated-features/ghas.md         |   2 +-
 .../gated-features/more-info-org-products.md  |   2 +-
 data/reusables/gated-features/more-info.md    |   2 +-
 .../gated-features/repository-insights.md     |   2 +-
 .../gated-features/restrict-email-domain.md   |   2 +-
 .../gated-features/security-overview.md       |   2 +-
 .../verify-and-approve-domain.md              |   2 +-
 .../outside-collaborators-use-seats.md        |   2 +-
 .../package_registry/packages-billing.md      |   2 +-
 .../products/which-product-to-use.md          |   2 +-
 data/reusables/repositories/you-can-fork.md   |   2 +-
 tests/fixtures/versionless-redirects.txt      |   6 +-
 107 files changed, 368 insertions(+), 260 deletions(-)
 rename content/billing/{managing-billing-for-your-github-account/about-billing-for-github-accounts.md => managing-the-plan-for-your-github-account/about-billing-for-plans.md} (50%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/about-per-user-pricing.md (85%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/connecting-an-azure-subscription.md (92%)
 rename content/billing/{managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md => managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md} (85%)
 rename content/billing/{managing-billing-for-your-github-account/downgrading-your-github-subscription.md => managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md} (73%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/how-does-upgrading-or-downgrading-affect-the-billing-process.md (91%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/index.md (50%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/managing-invoices-for-your-enterprise.md (90%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/one-time-payments-for-customers-in-india.md (100%)
 rename content/billing/{managing-billing-for-your-github-account/upgrading-your-github-subscription.md => managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md} (78%)
 rename content/billing/{managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md => managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md} (65%)
 rename content/billing/{managing-billing-for-your-github-account => managing-the-plan-for-your-github-account}/viewing-the-subscription-and-usage-for-your-enterprise-account.md (88%)
 rename content/billing/{managing-billing-for-your-github-account => managing-your-github-billing-settings}/about-billing-for-your-enterprise.md (91%)
 rename content/get-started/learning-about-github/{githubs-products.md => githubs-plans.md} (85%)
 create mode 100644 data/reusables/billing/about-billing.md

diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
index aff1948930df..200de50c06e5 100644
--- a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
+++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
@@ -183,7 +183,7 @@ When you participate in certain programs, {% data variables.product.prodname_dot
 | Badge | Program | Description |
 | --- | --- | --- |
 | {% octicon "cpu" aria-label="The Developer Program icon" %} | **Developer Program Member** | If you're a registered member of the {% data variables.product.prodname_dotcom %} Developer Program, building an app with the {% ifversion fpt or ghec %}{% data variables.product.prodname_dotcom %}{% else %}{% data variables.product.product_name %}{% endif %} API, you'll get a Developer Program Member badge on your profile. For more information on the {% data variables.product.prodname_dotcom %} Developer Program, see [GitHub Developer](/get-started/exploring-integrations/github-developer-program). |
-| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-pro)." |
+| {% octicon "star-fill" aria-label="The star icon" %} | **Pro** | If you use {% data variables.product.prodname_pro %} you'll get a PRO badge on your profile. For more information about {% data variables.product.prodname_pro %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-pro)." |
 | {% octicon "lock" aria-label="The lock icon" %} | **Security Bug Bounty Hunter** | If you helped out hunting down security vulnerabilities, you'll get a Security Bug Bounty Hunter badge on your profile. For more information about the {% data variables.product.prodname_dotcom %} Security program, see [{% data variables.product.prodname_dotcom %} Security](https://bounty.github.com/). |
 | {% octicon "mortar-board" aria-label="The mortar-board icon" %} | **{% data variables.product.prodname_dotcom %} Campus Expert** | If you participate in the {% data variables.product.prodname_campus_program %}, you will get a {% data variables.product.prodname_dotcom %} Campus Expert badge on your profile. For more information about the Campus Experts program, see [Campus Experts](https://education.github.com/experts). |
 | {% octicon "shield" aria-label="The shield icon" %} | **Security advisory credit** | If a security advisory you submit to the [{% data variables.product.prodname_dotcom %} Advisory Database](https://github.com/advisories) is accepted, you'll get a Security advisory credit badge on your profile. For more information about {% data variables.product.prodname_dotcom %} Security Advisories, see [{% data variables.product.prodname_dotcom %} Security Advisories](/code-security/security-advisories/repository-security-advisories/about-repository-security-advisories). |
diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
index 489c90921186..a9f861e91b75 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization.md
@@ -47,7 +47,9 @@ If you want your organization to have the same name that you are currently using
 You can also convert your personal account directly into an organization. Converting your account:
 - Preserves the repositories as they are without the need to transfer them to another account manually
 - Automatically invites collaborators to teams with permissions equivalent to what they had before
- {% ifversion fpt or ghec %}- For personal accounts on {% data variables.product.prodname_pro %}, automatically transitions billing to [the paid {% data variables.product.prodname_team %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) without the need to re-enter payment information, adjust your billing cycle, or double pay at any time{% endif %}
+{%- ifversion fpt or ghec %}
+- For personal accounts on {% data variables.product.prodname_pro %}, automatically transitions billing to [the paid {% data variables.product.prodname_team %}](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans) without the need to re-enter payment information, adjust your billing cycle, or double pay at any time
+{%- endif %}
 
 When you convert a personal account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as outside collaborators. You can then invite outside collaborators to become members of your new organization if you wish. For more information, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators)."
 
diff --git a/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md b/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
index d7ad54663686..77e3355e295d 100644
--- a/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
+++ b/content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md
@@ -31,7 +31,7 @@ You can configure environments with protection rules and secrets. When a workflo
 
 **Note:** Users with {% data variables.product.prodname_free_user %} plans can only configure environments for public repositories. If you convert a repository from public to private, any configured protection rules or environment secrets will be ignored, and you will not be able to configure any environments. If you convert your repository back to public, you will have access to any previously configured protection rules and environment secrets.
 
-Organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %} can configure environments for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %} can configure environments for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% endnote %}
 {% endif %}
@@ -127,7 +127,7 @@ Secrets stored in an environment are only available to workflow jobs that refere
 **Notes:**
 
 - Workflows that run on self-hosted runners are not run in an isolated container, even if they use environments. Environment secrets should be treated with the same level of security as repository and organization secrets. For more information, see "[AUTOTITLE](/actions/security-guides/security-hardening-for-github-actions#hardening-for-self-hosted-runners)."
-- Environment secrets are only available in public repositories if you are using {% data variables.product.prodname_free_user %}. For access to environment secrets in private or internal repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+- Environment secrets are only available in public repositories if you are using {% data variables.product.prodname_free_user %}. For access to environment secrets in private or internal repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. For more information on switching your plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
 
 {% endnote %}
 {% else %}
@@ -158,7 +158,7 @@ Variables stored in an environment are only available to workflow jobs that refe
 {% ifversion fpt %}
 {% note %}
 
-**Notes:** 
+**Notes:**
 
 - Creation of an environment in a private repository is available to organizations with {% data variables.product.prodname_team %} and users with {% data variables.product.prodname_pro %}.
 - Some features for environments have no or limited availability for private repositories. If you are unable to access a feature described in the instructions below, please see the documentation linked in the related step for availability information.
diff --git a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
index 7f78bfa89df0..08a53cf7a66c 100644
--- a/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
+++ b/content/actions/using-github-hosted-runners/about-github-hosted-runners.md
@@ -15,7 +15,7 @@ versions:
   ghes: '*'
   ghec: '*'
 ---
- 
+
 {% data reusables.actions.enterprise-github-hosted-runners %}
 
 ## Overview of {% data variables.product.prodname_dotcom %}-hosted runners
@@ -110,7 +110,7 @@ Hardware specification for macOS XL virtual machines:
 
 {% note %}
 
-**Note:** macOS XL runners are considered {% data variables.actions.hosted_runner %}s and are billed in the same way. This means macOS XL runners are not eligible for the use of entitlement minutes on private repositories. For both private and public repositories, when macOS XL runners are in use, they will always be billed at the per-minute rate. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners#understanding-billing)."
+**Note:** macOS XL runners are considered {% data variables.actions.hosted_runner %}s and are billed in the same way. This means macOS XL runners are not eligible for the use of included minutes on private repositories. For both private and public repositories, when macOS XL runners are in use, they will always be billed at the per-minute rate. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners#understanding-billing)."
 
 {% endnote %}
 
diff --git a/content/actions/using-github-hosted-runners/about-larger-runners.md b/content/actions/using-github-hosted-runners/about-larger-runners.md
index 8a8d97080dc2..f74592673415 100644
--- a/content/actions/using-github-hosted-runners/about-larger-runners.md
+++ b/content/actions/using-github-hosted-runners/about-larger-runners.md
@@ -19,7 +19,7 @@ When you add a {% data variables.actions.hosted_runner %} to an organization, yo
 
 {% note %}
 
-**Note**: {% data variables.actions.hosted_runner_caps %}s are not eligible for the use of entitlement minutes on private repositories. For both private and public repositories, when {% data variables.actions.hosted_runner %}s are in use, they will always be billed at the per-minute rate.
+**Note**: {% data variables.actions.hosted_runner_caps %}s are not eligible for the use of included minutes on private repositories. For both private and public repositories, when {% data variables.actions.hosted_runner %}s are in use, they will always be billed at the per-minute rate.
 
 {% endnote %}
 
@@ -78,7 +78,7 @@ You can configure the maximum job concurrency, which allows you to control your
 
 ## Networking for {% data variables.actions.hosted_runner %}s
 
-By default, {% data variables.actions.hosted_runner %}s receive a dynamic IP address that changes for each job run. Optionally, {% data variables.product.prodname_ghe_cloud %} customers can configure their {% data variables.actions.hosted_runner %}s to receive a static IP address from {% data variables.product.prodname_dotcom %}'s IP address pool. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses)." 
+By default, {% data variables.actions.hosted_runner %}s receive a dynamic IP address that changes for each job run. Optionally, {% data variables.product.prodname_ghe_cloud %} customers can configure their {% data variables.actions.hosted_runner %}s to receive a static IP address from {% data variables.product.prodname_dotcom %}'s IP address pool. For more information, see "[AUTOTITLE](/authentication/keeping-your-account-and-data-secure/about-githubs-ip-addresses)."
 
 When enabled, instances of the {% data variables.actions.hosted_runner %} will receive an address from a range that is unique to the runner, allowing you to use this range to configure a firewall allowlist. {% ifversion fpt %}You can use up to 10 static IP address ranges in total across all your {% data variables.actions.hosted_runner %}s{% endif %}{% ifversion ghec %}You can use up to 10 static IP address ranges for the {% data variables.actions.hosted_runner %}s created at the enterprise level. In addition, you can use up to 10 static IP address ranges for the {% data variables.actions.hosted_runner %}s created at the organization level, for each organization in your enterprise{% endif %}. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/managing-larger-runners#networking-for-larger-runners)."
 
diff --git a/content/admin/index.md b/content/admin/index.md
index 7a548b50d792..0af40eb9cb7d 100644
--- a/content/admin/index.md
+++ b/content/admin/index.md
@@ -94,7 +94,7 @@ featuredLinks:
     - '{% ifversion ghes %}/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-server{% endif %}'
     - '{% ifversion ghes %}/admin/installation{% endif %}'
     - '{% ifversion ghae %}/admin/identity-and-access-management/configuring-authentication-and-provisioning-for-your-enterprise-using-azure-ad{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
     - '{% ifversion ghae %}/admin/overview/about-upgrades-to-new-releases{% endif %}'
     - '{% ifversion ghae %}/admin/configuration/configuring-your-enterprise/deploying-github-ae{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise{% endif %}'
@@ -127,4 +127,3 @@ children:
   - /release-notes
   - /all-releases
 ---
-
diff --git a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
index 52c2dc8bcb83..76258da39fee 100644
--- a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise.md
@@ -29,7 +29,7 @@ You can add new organizations to your enterprise account. If you do not use {% d
 After you add an existing organization to your enterprise, the organization's resources remain accessible to members at the same URLs, and the following changes will apply.
 
 - If two-factor authentication (2FA) is required by the enterprise, organization members who do not use 2FA will be removed from the organization.
-- The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- The organization's members will become members of the enterprise, and {% data variables.product.company_short %} will bill the enterprise account for the organization's usage. You must ensure that the enterprise account has enough licenses to accommodate any new members. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 - Enterprise owners can manage their role within the organization. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise)."
 - Any policies applied to the enterprise will apply to the organization. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/about-enterprise-policies)."
 - If SAML SSO is configured for the enterprise account, the enterprise's SAML configuration will apply to the organization. If the organization used SAML SSO, the enterprise account's configuration will replace the organization's configuration. SCIM is not available for enterprise accounts, so SCIM will be disabled for the organization. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise)" and "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/switching-your-saml-configuration-from-an-organization-to-an-enterprise-account)."
diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
index a86b825040ea..9fa0788d7aa3 100644
--- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise.md
@@ -49,7 +49,7 @@ Owners of organizations in your enterprise do not have access to the enterprise
 Enterprise owners cannot access organization settings or content unless they are made an organization owner or given direct access to an organization-owned repository. Similarly, owners of organizations in your enterprise do not have access to the enterprise itself unless you make them enterprise owners.
 {% endif %}
 
-{% ifversion ghec %}An enterprise owner will only consume a license if they are an owner or member of at least one organization within the enterprise. {% endif %}Even if an enterprise owner has a role in multiple organizations, they will consume a single license. {% ifversion ghec %}Enterprise owners must have a personal account on {% data variables.product.prodname_dotcom %}.{% endif %} As a best practice, we recommend making only a few people in your company enterprise owners, to reduce the risk to your business. {% ifversion ghes %}For more information about accounts that consume a license for {% data variables.location.product_location %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing#accounts-that-consume-a-license-on-github-enterprise-server)."{% endif %}
+{% ifversion ghec %}An enterprise owner will only consume a license if they are an owner or member of at least one organization within the enterprise. {% endif %}Even if an enterprise owner has a role in multiple organizations, they will consume a single license. {% ifversion ghec %}Enterprise owners must have a personal account on {% data variables.product.prodname_dotcom %}.{% endif %} As a best practice, we recommend making only a few people in your company enterprise owners, to reduce the risk to your business. {% ifversion ghes %}For more information about accounts that consume a license for {% data variables.location.product_location %}, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing#accounts-that-consume-a-license-on-github-enterprise-server)."{% endif %}
 
 ## Enterprise members
 
diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
index 2dcfe8649f61..e6203c76015c 100644
--- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
+++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md
@@ -52,8 +52,8 @@ The scope of the events that appear in your enterprise's audit log depend on whe
 | Action | Description
 |--------|-------------
 | `account.billing_plan_change` | An organization's billing cycle changed. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle)."
-| `account.plan_change` | An organization's subscription changed. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)."
-| `account.pending_plan_change` | An organization owner or billing manager canceled or downgraded a paid subscription. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+| `account.plan_change` | An organization's plan changed. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans)."
+| `account.pending_plan_change` | An organization owner or billing manager canceled or downgraded a paid plan. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)."
 | `account.pending_subscription_change` | A {% data variables.product.prodname_marketplace %} free trial started or expired. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace)."
 {%- endif %}
 
diff --git a/content/admin/overview/about-enterprise-accounts.md b/content/admin/overview/about-enterprise-accounts.md
index 33eee697bf5d..e20acdcbf833 100644
--- a/content/admin/overview/about-enterprise-accounts.md
+++ b/content/admin/overview/about-enterprise-accounts.md
@@ -86,7 +86,7 @@ If you use both {% data variables.product.prodname_ghe_cloud %} and {% data vari
 
 You can also connect the enterprise account on {% data variables.location.product_location_enterprise %} to your enterprise account on {% data variables.product.prodname_dotcom_the_website %} to see license usage details for your {% data variables.product.prodname_enterprise %} subscription from {% data variables.product.prodname_dotcom_the_website %}. For more information, see {% ifversion ghec %}"[AUTOTITLE](/enterprise-server@latest/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)" in the {% data variables.product.prodname_ghe_server %} documentation.{% elsif ghes %}"[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."{% endif %}
 
-For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." {% data reusables.enterprise-accounts.to-upgrade-or-get-started %}
+For more information about the differences between {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)." {% data reusables.enterprise-accounts.to-upgrade-or-get-started %}
 
 {% endif %}
 
@@ -96,13 +96,13 @@ The bill for your enterprise account includes the monthly cost for each member o
 
 {% ifversion ghec %}
 
-For more information about billing for your {% data variables.product.prodname_ghe_cloud %} subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For more information about billing for your {% data variables.product.prodname_ghe_cloud %} subscription, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 {% elsif ghes %}
 
 {% data reusables.enterprise-accounts.enterprise-accounts-billing %}
 
-For more information about billing for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For more information about billing for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% else %}{% data variables.product.product_name %}{% endif %}, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 {% endif %}
 
@@ -110,7 +110,7 @@ For more information about billing for {% ifversion ghec %}{% data variables.pro
 
 {% ifversion ghec %}
 
-{% data variables.product.prodname_enterprise %} offers two deployment options. In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or supported cloud provider. {% endif %}Enterprise owners on {% data variables.product.prodname_dotcom_the_website %} can use an enterprise account to manage payment and licensing for {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)" and "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise)."
+{% data variables.product.prodname_enterprise %} offers two deployment options. In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or supported cloud provider. {% endif %}Enterprise owners on {% data variables.product.prodname_dotcom_the_website %} can use an enterprise account to manage payment and licensing for {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)" and "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise)."
 
 {% endif %}
 
diff --git a/content/admin/overview/creating-an-enterprise-account.md b/content/admin/overview/creating-an-enterprise-account.md
index ab2836af9b6b..c1df9815ba72 100644
--- a/content/admin/overview/creating-an-enterprise-account.md
+++ b/content/admin/overview/creating-an-enterprise-account.md
@@ -23,7 +23,7 @@ You can also create an enterprise account by setting up a free trial of {% data
 When you create an enterprise account that owns your existing organization on {% data variables.product.product_name %}, the organization's resources remain accessible to members at the same URLs. After you add your organization to the enterprise account, the following changes will apply to the organization.
 
 - Your existing organization will automatically be owned by the enterprise account.
-- {% data variables.product.company_short %} bills the enterprise account for usage within all organizations owned by the enterprise. The current billing details for the organization, including the organization's billing email address, will become billing details for the new enterprise account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+- {% data variables.product.company_short %} bills the enterprise account for usage within all organizations owned by the enterprise. The current billing details for the organization, including the organization's billing email address, will become billing details for the new enterprise account. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 - All current owners of your organization will become owners of the enterprise account, and all current billing managers of the organization will become billing managers of the new enterprise account. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise)."
 
 For more information about the changes that apply to an organization after you add the organization to an enterprise, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/adding-organizations-to-your-enterprise#about-addition-of-organizations-to-your-enterprise-account)."
diff --git a/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md b/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
index c6d99c1c6f39..b0ddc5d6417a 100644
--- a/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
+++ b/content/apps/creating-github-apps/registering-a-github-app/rate-limits-for-github-apps.md
@@ -50,7 +50,7 @@ When rate limits are enabled for your {% data variables.product.product_name %}
 
 {% ifversion ghec or fpt %}
 
-The rate limits for requests made by a {% data variables.product.prodname_github_app %} depend on where the app is installed. If the app is installed on an organization or repository owned by an enterprise on {% data variables.location.product_location %}, the rate limit will be higher than for an app that is installed outside an enterprise. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts#organization-accounts)."
+The rate limits for requests made by a {% data variables.product.prodname_github_app %} depend on where the app is installed. If the app is installed on an organization or repository owned by an enterprise on {% data variables.location.product_location %}, the rate limit will be higher than for an app that is installed outside an enterprise. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts#organization-accounts)."
 
 {% endif %}
 
diff --git a/content/billing/index.md b/content/billing/index.md
index 77a5b071cabf..213848c202fc 100644
--- a/content/billing/index.md
+++ b/content/billing/index.md
@@ -1,34 +1,34 @@
 ---
 title: Billing and payments documentation
 shortTitle: Billing and payments
-intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade or downgrade your account''s subscription and manage your billing settings at any time.{% elsif ghec or ghes or ghae %}{% data variables.product.company_short %} bills for your enterprise members'' {% ifversion ghec or ghae %}usage of {% data variables.product.product_name %}{% elsif ghes %} licence seats for {% data variables.product.product_name %}{% ifversion ghes %} and any additional services that you purchase{% endif %}{% endif %}. {% endif %}{% ifversion ghec %} You can view your subscription and manage your billing settings at any time. {% endif %}{% ifversion fpt or ghec %} You can also view usage and manage spending limits for {% data variables.product.product_name %} features such as {% data variables.product.prodname_actions %}, {% data variables.product.prodname_registry %}, and {% data variables.product.prodname_github_codespaces %}.{% endif %}'
+intro: "Learn about the different components of your bill, and how you can view and manage those components."
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
 introLinks:
-  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
 featuredLinks:
   startHere:
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method{% endif %}'
-    - '{% ifversion fpt %}/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription{% endif %}'
-    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion fpt %}/billing/managing-the-plan-for-your-github-accountt/upgrading-your-accounts-plan{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-accountt/about-billing-for-your-enterprise{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/setting-your-billing-email{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/about-per-user-pricing{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   popular:
-    - '{% ifversion ghec %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
     - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
-    - '{% ifversion ghae %}/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise{% endif %}'
+    - '{% ifversion ghae %}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
   guideCards:
-    - /billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
+    - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
     - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud{% endif %}'
@@ -42,7 +42,7 @@ topics:
   - Billing
 children:
   - /managing-your-github-billing-settings
-  - /managing-billing-for-your-github-account
+  - /managing-the-plan-for-your-github-account
   - /managing-your-license-for-github-enterprise
   - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
   - /managing-billing-for-github-actions
@@ -55,4 +55,3 @@ children:
   - /managing-billing-for-git-large-file-storage
   - /setting-up-paid-accounts-for-procurement-companies
 ---
-
diff --git a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
index a6b314bac4d0..14d1dff2b6c2 100644
--- a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
+++ b/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
@@ -25,7 +25,7 @@ shortTitle: Billing for GitHub Actions
 
 {% data reusables.actions.actions-spending-limit-brief %} For more information, see "[About spending limits](#about-spending-limits)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 Minutes reset every month, while storage usage does not.
 
@@ -33,11 +33,11 @@ Minutes reset every month, while storage usage does not.
 
 {% note %}
 
-**Note**: Entitlement minutes cannot be used for larger runners. These runners will always be charged for, including in public repos. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates)."
+**Note**: Included minutes cannot be used for larger runners. These runners will always be charged for, including in public repos. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#per-minute-rates)."
 
 {% endnote %}
 
-|Product | Storage | Minutes (per month)|
+|Plan | Storage | Minutes (per month)|
 |------- | ------- | ---------|
 | {% data variables.product.prodname_free_user %} | 500 MB | 2,000 |
 | {% data variables.product.prodname_pro %} | 1 GB | 3,000 |
@@ -73,7 +73,7 @@ The storage used by a repository is the total storage used by {% data variables.
 - {% data reusables.user-settings.context_switcher %}
 - {% data reusables.actions.about-larger-runners-billing %}
 - For {% data variables.actions.hosted_runner %}s, there is no additional cost for configurations that assign public static IP addresses to a {% data variables.actions.hosted_runner %}. For more information on {% data variables.actions.hosted_runner %}s, see "[AUTOTITLE](/actions/using-github-hosted-runners/using-larger-runners)."
-- Entitlement minutes cannot be used for {% data variables.actions.hosted_runner %}s.
+- Included minutes cannot be used for {% data variables.actions.hosted_runner %}s.
 - The {% data variables.actions.hosted_runner %}s are not free for public repositories.
 
 ## Calculating minute and storage spending
diff --git a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
index 079bf84e4bde..34d66c43b00a 100644
--- a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
+++ b/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
@@ -24,7 +24,7 @@ shortTitle: Spending limits for Actions
 
 {% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_actions %} usage, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_actions %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and creates workflow artifacts that increase your storage usage for the month from 1.9GB to 2.1GB, you will use slightly more storage than the 2GB your product includes.
 
diff --git a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
index a7b7f638a574..36c136d0b1ab 100644
--- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
@@ -102,7 +102,7 @@ If you enable prebuilding of codespaces this will incur additional charges. For
 
 Billing for {% data variables.product.prodname_github_codespaces %} shares your account's existing payment method, and receipt. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## About billing for compute usage
 
diff --git a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
index baaf1090b9d3..8f2cefc8a258 100644
--- a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
@@ -28,7 +28,7 @@ Once you've reached your spending limit, you will no longer be able to create ne
 
 ## Using your Azure Subscription
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your personal account
 
diff --git a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
index 1c531b36b1b1..c56f7be05a2d 100644
--- a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
+++ b/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
@@ -8,9 +8,10 @@ topics:
   - Copilot
 shortTitle: Billing for GitHub Copilot
 ---
+
 ## About billing for {% data variables.product.prodname_copilot %}
 
-You can either set up a {% data variables.product.prodname_copilot %} subscription for your personal account, or you can set up a {% data variables.product.prodname_copilot_for_business %} subscription for your organization{% ifversion ghec %} or enterprise. If you are a member of a {% data variables.product.prodname_ghe_cloud %} organization with a {% data variables.product.prodname_copilot_for_business %} subscription, you will need to be assigned a seat by an organization admin.{% endif %} {% ifversion fpt %}For more information about {% data variables.product.prodname_copilot_for_individuals %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)."{% endif %} {% ifversion ghec %}For more information about {% data variables.product.prodname_copilot_for_business %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-business)."{% endif %}
+You can either set up a {% data variables.product.prodname_copilot %} subscription for your personal account, or you can set up a {% data variables.product.prodname_copilot_for_business %} subscription for your organization{% ifversion ghec %} or enterprise. If you are a member of an organization with a {% data variables.product.prodname_copilot_for_business %} subscription, you will need to be assigned a seat by an organization owner{% endif %}. {% ifversion fpt %}For more information about {% data variables.product.prodname_copilot_for_individuals %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-individuals)."{% endif %} {% ifversion ghec %}For more information about {% data variables.product.prodname_copilot_for_business %}, see "[AUTOTITLE](/copilot/overview-of-github-copilot/about-github-copilot-for-business)."{% endif %}
 
 {% ifversion fpt %}Before starting a paid subscription for a personal account, you can set up a one-time {% data reusables.copilot.trial-period %}-day trial to evaluate {% data variables.product.prodname_copilot %}. To begin a trial, you will need to choose a monthly or yearly billing cycle, and provide a payment method. If you do not cancel the trial before the end of the {% data reusables.copilot.trial-period %} days, the trial will automatically convert to a paid subscription. You can cancel your {% data variables.product.prodname_copilot %} trial at any time during the {% data reusables.copilot.trial-period %} days and you won't be charged. If you cancel before the end of the trial, you will continue to have access to {% data variables.product.prodname_copilot %} until the {% data reusables.copilot.trial-period %}-day trial period ends. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-copilot/managing-your-github-copilot-subscription-for-your-personal-account)."
 
diff --git a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
index 4a3a621090a0..dabf4b00e1ac 100644
--- a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
+++ b/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
@@ -32,13 +32,13 @@ shortTitle: About billing
 
 {% endnote %}
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 Data transfer resets every month, while storage usage does not.
 
 {% rowheaders %}
 
-Product | Storage | Data transfer (per month)
+Plan | Storage | Data transfer (per month)
 ------- | ------- | ---------
 {% data variables.product.prodname_free_user %} | 500MB | 1GB
 {% data variables.product.prodname_pro %} | 2GB | 10GB
diff --git a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md b/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
index 4604ff1f8519..c5c7799cc716 100644
--- a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
+++ b/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
@@ -25,7 +25,7 @@ shortTitle: Your spending limit
 
 {% data reusables.actions.actions-packages-set-spending-limit %} For more information about pricing for {% data variables.product.prodname_registry %} usage, see "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_registry %} usage beyond the amounts including with your account. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 As soon as you set a spending limit other than $0, you will be responsible for any existing overages in the current billing period. For example, if your organization uses {% data variables.product.prodname_team %}, does not allow overages, and publishes a new version of a private package that increases your storage usage for the month from 1.9GB to 2.1GB, publishing the version will use slightly more than the 2GB your product includes.
 
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
index 173e401f555e..c4ce05bf0bca 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
@@ -33,13 +33,13 @@ After you assign a license for {% data variables.visual_studio.prodname_vss_ghe
 
 The total quantity of your licenses for your enterprise on {% data variables.product.prodname_dotcom %} is the sum of any standard {% data variables.product.prodname_enterprise %} licenses and the number of {% data variables.product.prodname_vs %} subscription licenses that include access to {% data variables.product.prodname_dotcom %}. If the personal account for an enterprise member does not correspond with the email address for a {% data variables.product.prodname_vs %} subscriber, the license that the personal account consumes is unavailable for a {% data variables.product.prodname_vs %} subscriber.
 
-For more information about {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)." For more information about accounts on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
+For more information about {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)." For more information about accounts on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-You can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise on {% data variables.location.product_location %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)."
+You can view the number of {% data variables.product.prodname_enterprise %} licenses available to your enterprise on {% data variables.location.product_location %}. The list of pending invitations includes subscribers who are not yet members of at least one organization in your enterprise. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/viewing-people-in-your-enterprise#viewing-members-and-outside-collaborators)."
 
 {% tip %}
 
-**Tip**: If you download a CSV file with your enterprise's license usage in step 6 of "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account#viewing-the-subscription-and-usage-for-your-enterprise-account)," any members with a missing value for the "Name" or "Profile" columns have not yet accepted an invitation to join an organization within the enterprise.
+**Tip**: If you download a CSV file with your enterprise's license usage in step 6 of "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account#viewing-the-subscription-and-usage-for-your-enterprise-account)," any members with a missing value for the "Name" or "Profile" columns have not yet accepted an invitation to join an organization within the enterprise.
 
 {% endtip %}
 
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
index c1cc6098970d..ef133fe73f8f 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
@@ -60,7 +60,7 @@ One person may be able to complete the tasks because the person has all of the r
 
     {% endtip %}
 
-After {% data variables.visual_studio.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+After {% data variables.visual_studio.prodname_vss_ghe %} is set up for subscribers on your team, enterprise owners can review licensing information on {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 ## Further reading
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md b/content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
similarity index 50%
rename from content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
rename to content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
index 411df1d04622..f093d80caca7 100644
--- a/content/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts.md
+++ b/content/billing/managing-the-plan-for-your-github-account/about-billing-for-plans.md
@@ -1,6 +1,6 @@
 ---
-title: About billing for GitHub accounts
-intro: '{% data variables.product.company_short %} offers free and paid products for every developer or team.'
+title: About billing for plans
+intro: '{% data variables.product.company_short %} offers free and paid plans for every developer or team.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-accounts
   - /articles/what-is-the-total-cost-of-using-an-organization-account
@@ -11,7 +11,8 @@ redirect_from:
   - /articles/organization-billing-plans
   - /articles/github-s-billing-plans
   - /articles/about-billing-for-github-accounts
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-billing-for-github-accounts
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-the-plan-for-your-github-account/about-billing-for-github-accounts
+  - /billing/managing-billing-for-your-github-account/about-billing-for-github-accounts
 versions:
   fpt: '*'
   ghec: '*'
@@ -21,14 +22,18 @@ topics:
   - Discounts
   - Fundamentals
   - Upgrades
-shortTitle: About billing
+shortTitle: About plans
 ---
 
-For more information about the products available for your account, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." You can see pricing and a full list of features for each product at <{% data variables.product.pricing_url %}>. {% data variables.product.product_name %} does not offer custom products or subscriptions.  
+{% data reusables.billing.about-billing %} This article discusses the "plan" component of your bill, specifically. For more information about the other components, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
-You can choose monthly or yearly billing, and you can upgrade or downgrade your subscription at any time. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account)."
+For more information about the plans available for your account, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
-You can purchase other features and products with your existing {% data variables.product.product_name %} payment information. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
+You can see pricing and a full list of features for each plan at {% data variables.product.pricing_url %}. {% data variables.product.product_name %} does not offer custom products or plans.
+
+You can choose monthly or yearly billing, and you can upgrade or downgrade your plan at any time. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account)."
+
+You can purchase other subscriptions and usage-based billing with your existing payment information. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
 {% data reusables.accounts.accounts-billed-separately %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
similarity index 85%
rename from content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md
rename to content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
index 1924977d5430..3cd66426fa72 100644
--- a/content/billing/managing-billing-for-your-github-account/about-per-user-pricing.md
+++ b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
@@ -4,7 +4,7 @@ intro: '{% ifversion fpt or ghec %}For organizations{% ifversion ghec %} and ent
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-per-user-pricing
   - /articles/about-per-user-pricing
-  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/about-per-user-pricing
+  - /github/setting-up-and-managing-billing-and-payments-on-github/managing-the-plan-for-your-github-account/about-per-user-pricing
 versions:
   fpt: '*'
   ghec: '*'
@@ -21,9 +21,15 @@ topics:
 
 {% ifversion fpt %}
 
-New organizations on {% data variables.product.prodname_dotcom_the_website %} can build public and open-source projects with {% data variables.product.prodname_free_team %}, or upgrade to a paid product with per-user pricing. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+{% data reusables.billing.about-billing %} For organizations, the "plan" component of the bill is based on the number of licensed seats you choose to purchase.
 
-Organizations using a paid subscription before May 11, 2016 can choose to stay on their existing per-repository plan or switch to per-user pricing. {% data variables.product.company_short %} will notify you twelve months before any mandated change to your subscription. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)."
+New organizations on {% data variables.product.prodname_dotcom_the_website %} can build public and open-source projects with {% data variables.product.prodname_free_team %}, or upgrade to a paid plan. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
+
+{% note %}
+
+**Note:** Organizations who upgraded to a paid plan before May 11, 2016 can choose to stay on their existing per-repository plan or switch to per-user pricing. {% data variables.product.company_short %} will notify you twelve months before any mandated change to your subscription. For more information on switching your subscription, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
+
+{% endnote %}
 
 {% else %}
 
@@ -33,7 +39,7 @@ The foundation of your bill is the number of standard licensed seats that you ch
 
 To ensure the same user isn't consuming more than one license for multiple enterprise deployments, you can synchronize license usage between your {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %} environments. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise)."
 
-In addition to licensed seats, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+In addition to licensed seats, your bill may include other charges, such as {% data variables.product.prodname_GH_advanced_security %}. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 {% endif %}
 
 ## People that consume a license
@@ -116,13 +122,13 @@ You can change your {% data variables.product.prodname_dotcom %} subscription at
 
 {% endif %}
 
-You can add more licensed seats to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more seats than are being used, you can also reduce the number of seats.{% ifversion fpt %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+You can add more licensed seats to your {% ifversion fpt or ghec %} organization{% endif %}{% ifversion ghec %} or{% endif %}{% ifversion ghec or ghes %} enterprise{% endif %} at any time. If you pay for more seats than are being used, you can also reduce the number of seats.{% ifversion fpt %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
 
 To further support your team's collaboration abilities, you can upgrade to {% data variables.product.prodname_ghe_cloud %}, which includes features like SAML single sign-on and advanced auditing. {% data reusables.enterprise.link-to-ghec-trial %}
 
-For more information about per-user pricing for {% data variables.product.prodname_ghe_cloud %}, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-per-user-pricing).
+For more information about per-user pricing for {% data variables.product.prodname_ghe_cloud %}, see [the {% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing).
 
 {% else %}
 
@@ -131,7 +137,7 @@ If you use an enterprise account on {% data variables.product.prodname_dotcom_th
 {% endif %}
 {% ifversion ghec %}
 
-If you use an individual organization on {% data variables.product.prodname_ghe_cloud %}, you can upgrade or downgrade your subscription. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription)" or "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)." If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
+If you use an individual organization on {% data variables.product.prodname_ghe_cloud %}, you can upgrade or downgrade your subscription. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)" or "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)." If you have questions about your subscription, contact {% data variables.contact.contact_support %}.
 
 {% endif %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
similarity index 92%
rename from content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
index 3068adc7e5db..ae0958a1393f 100644
--- a/content/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
@@ -1,11 +1,11 @@
 ---
 title: Connecting an Azure subscription
-intro: 'Organization owners {% ifversion ghec %} and enterprise owners {% endif %}can connect an Azure Subscription to their account to enable and pay for any {% data variables.product.prodname_dotcom %} metered services.'
+intro: 'You can connect an Azure Subscription to your organization{% ifversion ghec %} or enterprise account{% endif %} to enable and pay for any {% data variables.product.prodname_dotcom %} metered services.'
 redirect_from:
   - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/connecting-an-azure-subscription-to-your-enterprise
   - /github/setting-up-and-managing-billing-and-payments-on-github/connecting-an-azure-subscription-to-your-enterprise
   - /github/setting-up-and-managing-your-enterprise/connecting-an-azure-subscription-to-your-enterprise
-  - /enterprise-cloud@latest/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
+  - /enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise
 versions:
   fpt: '*'
   ghec: '*'
@@ -29,6 +29,7 @@ If your organization is a part of an enterprise account, you can only connect yo
 
 {% endnote %}
 {% endif %}
+
 After you connect an Azure subscription, you can also manage your spending limits.
 
 - "[AUTOTITLE](/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages)"
@@ -43,7 +44,7 @@ If the user does not have adequate permissions, the user must obtain admin appro
 
 ## Connecting your Azure subscription to your organization account
 
-To connect your Azure subscription, you must have owner permissions to the subscription.
+To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an organization owner on {% data variables.product.prodname_dotcom %}.
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
@@ -64,7 +65,7 @@ To connect your Azure subscription, you must have owner permissions to the subsc
 
 ## Connecting your Azure subscription to your enterprise account
 
-To connect your Azure subscription, you must have owner permissions to the subscription.
+To connect your Azure subscription, you must have owner permissions to the Azure subscription and be an enterprise owner on {% data variables.product.prodname_dotcom %}.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
diff --git a/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md b/content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
similarity index 85%
rename from content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
rename to content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
index e1a05f984ccd..6ba4abe9ff80 100644
--- a/content/billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts.md
+++ b/content/billing/managing-the-plan-for-your-github-account/discounted-plans-for-github-accounts.md
@@ -1,5 +1,5 @@
 ---
-title: Discounted subscriptions for GitHub accounts
+title: Discounted plans for GitHub accounts
 intro: '{% data variables.product.product_name %} provides discounts to students, educators, educational institutions, nonprofits, and libraries.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/discounted-subscriptions-for-github-accounts
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/discounted-billing-plans
   - /articles/discounted-subscriptions-for-github-accounts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
+  - /billing/managing-billing-for-your-github-account/discounted-subscriptions-for-github-accounts
 versions:
   fpt: '*'
   ghec: '*'
@@ -18,11 +19,11 @@ topics:
   - Discounts
   - Nonprofits
   - User account
-shortTitle: Discounted subscriptions
+shortTitle: Discounted plans
 ---
 {% tip %}
 
-**Tip**: Discounts for {% data variables.product.prodname_dotcom %} do not apply to subscriptions for other paid products and features.
+**Tip**: Discounts for an account's plan do not apply to other subscriptions or usage-based billing.
 
 {% endtip %}
 
@@ -38,7 +39,7 @@ Verified academic faculty can apply for {% data variables.product.prodname_team
 
 {% data variables.product.product_name %} provides free {% data variables.product.prodname_team %} for organizations with unlimited private repositories, unlimited collaborators, and a full feature set to qualifying 501(c)3 (or equivalent) organizations and libraries. You can request a discount for your organization on [our nonprofit page](https://github.com/nonprofit).
 
-If your organization already has a paid subscription, your organization's last transaction will be refunded once your nonprofit discount has been applied.
+If your organization already has a paid plan, your organization's last transaction will be refunded once your nonprofit discount has been applied.
 
 ## Further reading
 
diff --git a/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
similarity index 73%
rename from content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
index 9d210759d933..964202d7852b 100644
--- a/content/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Downgrading your GitHub subscription
-intro: 'You can downgrade the subscription for any type of account on {% data variables.location.product_location %} at any time.'
+title: Downgrading your account's plan
+intro: 'You can downgrade the plan for any type of account on {% data variables.location.product_location %} at any time.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-your-github-subscription
   - /articles/downgrading-your-personal-account-s-billing-plan
@@ -17,6 +17,7 @@ redirect_from:
   - /articles/downgrading-your-github-billing-plan
   - /articles/downgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/downgrading-your-github-subscription
+  - /billing/managing-billing-for-your-github-account/downgrading-your-github-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -26,13 +27,14 @@ topics:
   - Organizations
   - Repositories
   - User account
-shortTitle: Downgrade subscription
+shortTitle: Downgrade plan
 ---
-## Downgrading your {% data variables.product.product_name %} subscription
 
-When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Changes to your paid account subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features. For more information, see "[AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+## About downgrades
 
-## Downgrading your personal account's subscription
+When you downgrade your personal account, organization, or enterprise account's subscription, pricing and account feature changes take effect on your next billing date. Downgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see "[AUTOTITLE](/articles/how-does-upgrading-or-downgrading-affect-the-billing-process)."
+
+## Downgrading your personal account's plan
 
 If you downgrade your personal account from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, the account will lose access to advanced code review tools on private repositories. {% data reusables.gated-features.more-info %}
 
@@ -44,11 +46,11 @@ If you downgrade your personal account from {% data variables.product.prodname_p
 
 If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, remove or update your DNS records before downgrading from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
 
-## Downgrading your organization's subscription
+## Downgrading your organization's plan
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-After an organization's subscription is downgraded, the organization will lose access to any functionality that is not included its new plan. If an advanced feature, such as {% data variables.product.prodname_pages %}, is not available for private repositories in your new plan, consider whether you'd like to retain access to the feature by making affected repositories public. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)."
+After an organization's plan is downgraded, the organization will lose access to any functionality that is not included in the new plan. If an advanced feature, such as {% data variables.product.prodname_pages %}, is not available for private repositories in your new plan, consider whether you'd like to retain access to the feature by making affected repositories public. For more information, see "[Setting repository visibility](/articles/setting-repository-visibility)."
 
 Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SAML settings. If you later purchase {% data variables.product.prodname_enterprise %}, you will need to reconfigure SAML.
 
@@ -63,14 +65,14 @@ Downgrading from {% data variables.product.prodname_ghe_cloud %} disables any SA
    ![Screenshot of the "Current plan" section of the billing settings page. The "Edit" dropdown menu is expanded and highlighted with an orange outline.](/assets/images/help/billing/downgrade-to-free.png)
 {% data reusables.dotcom_billing.confirm_cancel_org_plan %}
 
-## Downgrading an organization's subscription with legacy per-repository pricing
+## Downgrading an organization's plan with legacy per-repository pricing
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
-{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#switching-your-organization-from-per-repository-to-per-user-pricing)."
+{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan#switching-your-organization-from-per-repository-to-per-user-pricing)."
 
 {% data reusables.organizations.billing-settings %}
-1. Under "Subscriptions", next to your current subscription, select the **Edit** dropdown menu and click **Edit plan**.
+5. Under "Subscriptions", next to your current plan, select the **Edit** dropdown menu and click **Edit plan**.
 1. Under "Billing/Plans", next to the plan you want to change, click **Downgrade**.
 1. Enter the reason you're downgrading your account, then click **Downgrade plan**.
 
@@ -87,12 +89,11 @@ To reduce the number of paid seats your organization uses, you can remove member
 1. Review the information about your new payment on your next billing date, then click **Remove seats**.
 
 {% ifversion ghec %}
-
-## Downgrading your enterprise account's subscription
+## Downgrading your enterprise account's plan
 
 Enterprise accounts are only available with {% data variables.product.prodname_enterprise %}, so it's not possible to downgrade an enterprise account to another plan.
 
-To downgrade the subscription of an individual organization within the enterprise account, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
+To downgrade the plan of an individual organization within the enterprise account, you must remove the organization from the enterprise account first. For more information, see "[AUTOTITLE](/admin/user-management/managing-organizations-in-your-enterprise/removing-organizations-from-your-enterprise)."
 
 If you want to stop paying for {% data variables.product.prodname_enterprise %} altogether, you can [contact our sales team](https://github.com/enterprise/contact). All organizations owned by the enterprise account will removed from the enterprise, and the enterprise account will be frozen.
 
@@ -114,7 +115,7 @@ If you want to stop paying for {% data variables.product.prodname_enterprise %}
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
 - "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
diff --git a/content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
similarity index 91%
rename from content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
rename to content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
index 0ccbf8cf7673..7219a60d4990 100644
--- a/content/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
+++ b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
@@ -18,7 +18,7 @@ shortTitle: Billing process
 ---
 Changes to your paid personal account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features, such as {% data variables.large_files.product_name_long %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
 
-For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
+For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
 ## Example of canceling a paid subscription for a personal account or organization
 
@@ -38,7 +38,7 @@ Stefan's organization pays for 50 seats every year on May 20th. If Stefan remove
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account)"
 - "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps)"
 - "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
diff --git a/content/billing/managing-billing-for-your-github-account/index.md b/content/billing/managing-the-plan-for-your-github-account/index.md
similarity index 50%
rename from content/billing/managing-billing-for-your-github-account/index.md
rename to content/billing/managing-the-plan-for-your-github-account/index.md
index dbfa437297c9..3ac11b35e0fc 100644
--- a/content/billing/managing-billing-for-your-github-account/index.md
+++ b/content/billing/managing-the-plan-for-your-github-account/index.md
@@ -1,7 +1,7 @@
 ---
-title: Managing billing for your GitHub account
-shortTitle: Your GitHub account
-intro: '{% ifversion fpt %}{% data variables.product.product_name %} offers free and paid products for every account. You can upgrade, downgrade, and view pending changes to your account''s subscription at any time.{% elsif ghec or ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghec or ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}'
+title: Managing the plan for your GitHub account
+shortTitle: Manage your plan
+intro: "{% ifversion fpt %}You can upgrade, downgrade, and view pending changes to your account's plan at any time.{% elsif ghec or ghes or ghae %}You can manage billing for {% data variables.product.product_name %}{% ifversion ghae %}.{% elsif ghec or ghes %} from your enterprise account on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}{% endif %}"
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account
   - /categories/97/articles
@@ -17,18 +17,16 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
 children:
-  - /about-billing-for-github-accounts
-  - /about-billing-for-your-enterprise
+  - /about-billing-for-plans
   - /about-per-user-pricing
   - /viewing-the-subscription-and-usage-for-your-enterprise-account
-  - /upgrading-your-github-subscription
-  - /viewing-and-managing-pending-changes-to-your-subscription
-  - /downgrading-your-github-subscription
+  - /upgrading-your-accounts-plan
+  - /viewing-and-managing-pending-changes-to-your-plan
+  - /downgrading-your-accounts-plan
   - /managing-invoices-for-your-enterprise
   - /connecting-an-azure-subscription
   - /how-does-upgrading-or-downgrading-affect-the-billing-process
   - /one-time-payments-for-customers-in-india
-  - /discounted-subscriptions-for-github-accounts
+  - /discounted-plans-for-github-accounts
 ---
diff --git a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md b/content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
similarity index 90%
rename from content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md
rename to content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
index 976ab35ecd7e..ffbf7dc3de0f 100644
--- a/content/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise.md
+++ b/content/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise.md
@@ -2,6 +2,8 @@
 title: Managing invoices for your enterprise
 shortTitle: Manage invoices
 intro: 'You can view, pay, or download a current invoice for your enterprise, and you can view your payment history.'
+redirect_from:
+  - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
 versions:
   ghec: '*'
 type: how_to
@@ -12,11 +14,11 @@ topics:
 
 ## About invoices for your enterprise
 
-For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 Only invoiced customers can view invoices on {% data variables.product.prodname_dotcom %}. If you pay automatically via credit card or PayPal, you can view receipts and payment history instead. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts)."
 
-For more information about viewing the subscription and usage for your enterprise account, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+For more information about viewing the subscription and usage for your enterprise account, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 {% data reusables.billing.ghes-with-no-enterprise-account %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md b/content/billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india.md
similarity index 100%
rename from content/billing/managing-billing-for-your-github-account/one-time-payments-for-customers-in-india.md
rename to content/billing/managing-the-plan-for-your-github-account/one-time-payments-for-customers-in-india.md
diff --git a/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
similarity index 78%
rename from content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
index b828bd42cf7f..5fb113acf02a 100644
--- a/content/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Upgrading your GitHub subscription
-intro: 'You can upgrade the subscription for any type of account on {% data variables.location.product_location %} at any time.'
+title: Upgrading your account's plan
+intro: 'You can upgrade the plan for any type of account on {% data variables.location.product_location %} at any time.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-your-github-subscription
   - /articles/upgrading-your-personal-account-s-billing-plan
@@ -19,6 +19,7 @@ redirect_from:
   - /articles/upgrading-your-github-billing-plan
   - /articles/upgrading-your-github-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/upgrading-your-github-subscription
+  - /billing/managing-billing-for-your-github-account/upgrading-your-github-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -28,18 +29,20 @@ topics:
   - Troubleshooting
   - Upgrades
   - User account
-shortTitle: Upgrade your subscription
+shortTitle: Upgrade your plan
 ---
 
-## About subscription upgrades
+## About upgrades
 
 {% data reusables.accounts.accounts-billed-separately %}
 
-When you upgrade the subscription for an account, the upgrade changes the paid features available for that account only, and not any other accounts you use.
+Upgrading your plan does not affect other subscriptions or usage-based billing for your account. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
 
-## Upgrading your personal account's subscription
+## Upgrading your personal account's plan
 
-You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your personal account. Upgrading your personal account does not affect any organizations you may manage or repositories owned by those organizations. {% data reusables.gated-features.more-info %}
+You can upgrade your personal account from {% data variables.product.prodname_free_user %} to {% data variables.product.prodname_pro %} to get advanced code review tools on private repositories owned by your personal account.
+
+pgrading your personal account does not affect any organizations you may manage or repositories owned by those organizations. {% data reusables.gated-features.more-info %}
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.billing_plans %}
@@ -51,13 +54,15 @@ You can upgrade your personal account from {% data variables.product.prodname_fr
 {% data reusables.dotcom_billing.enter-payment-info %}
 {% data reusables.dotcom_billing.finish_upgrade %}
 
-## Managing your organization's subscription
+## Managing your organization's plan
+
+You can upgrade your organization's plan, add seats to your existing plan, or switch from per-repository to per-user pricing.
 
-You can upgrade your organization's subscription to a different product, add seats to your existing product, or switch from per-repository to per-user pricing.
+### Upgrading your organization's plan
 
-### Upgrading your organization's subscription
+You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls.
 
-You can upgrade your organization from {% data variables.product.prodname_free_team %} for an organization to {% data variables.product.prodname_team %} to access advanced collaboration and management tools for teams, or upgrade your organization to {% data variables.product.prodname_ghe_cloud %} for additional security, compliance, and deployment controls. Upgrading an organization does not affect your personal account or repositories owned by your personal account. {% data reusables.gated-features.more-info-org-products %}
+Upgrading an organization does not affect your personal account or repositories owned by your personal account. {% data reusables.gated-features.more-info-org-products %}
 
 {% data reusables.dotcom_billing.org-billing-perms %}
 
@@ -87,7 +92,7 @@ If you'd like additional users to have access to your {% data variables.product.
 
 ### Switching your organization from per-repository to per-user pricing
 
-{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+{% data reusables.dotcom_billing.switch-legacy-billing %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% data reusables.organizations.billing-settings %}
 1. To the right of your plan name, select the **Edit** dropdown menu, then click **Edit plan**.
@@ -121,6 +126,6 @@ If you'd like additional users to have access to your {% data variables.product.
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process)"
 - "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
diff --git a/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
similarity index 65%
rename from content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
rename to content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
index 7a113fbda64f..fb4fc350115f 100644
--- a/content/billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/viewing-and-managing-pending-changes-to-your-plan.md
@@ -1,6 +1,6 @@
 ---
-title: Viewing and managing pending changes to your subscription
-intro: You can view and cancel pending changes to your subscriptions before they take effect on your next billing date.
+title: Viewing and managing pending changes to your plan
+intro: You can view and cancel pending changes to your plan before they take effect on your next billing date.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-and-managing-pending-changes-to-your-subscription
   - /articles/viewing-and-managing-pending-changes-to-your-personal-account-s-billing-plan
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/viewing-and-managing-pending-changes-to-your-billing-plan
   - /articles/viewing-and-managing-pending-changes-to-your-subscription
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
+  - /billing/managing-billing-for-your-github-account/viewing-and-managing-pending-changes-to-your-subscription
 versions:
   fpt: '*'
   ghec: '*'
@@ -15,13 +16,16 @@ type: how_to
 topics:
   - Organizations
   - User account
-shortTitle: Pending subscription changes
+shortTitle: Pending plan changes
 ---
-You can cancel pending changes to your account's subscription as well as pending changes to your subscriptions to other paid features and products.
 
-When you cancel a pending change, your subscription will not change on your next billing date (unless you make a subsequent change to your subscription before your next billing date).
+## About pending plan changes
 
-## Viewing and managing pending changes to your personal account's subscription
+You can cancel pending changes to your account's plan as well as pending changes to other subscriptions and usage-based billing.
+
+When you cancel a pending change, your plan will not change until your next billing date.
+
+## Viewing and managing pending changes to your personal account's plan
 
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.billing_plans %}
@@ -29,7 +33,7 @@ When you cancel a pending change, your subscription will not change on your next
 {% data reusables.dotcom_billing.cancel-pending-changes %}
 {% data reusables.dotcom_billing.confirm-cancel-pending-changes %}
 
-## Viewing and managing pending changes to your organization's subscription
+## Viewing and managing pending changes to your organization's plan
 
 {% data reusables.organizations.billing-settings %}
 {% data reusables.dotcom_billing.review-pending-changes %}
@@ -38,4 +42,4 @@ When you cancel a pending change, your subscription will not change on your next
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
diff --git a/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
similarity index 88%
rename from content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
rename to content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
index 0d94e56f5909..7f0292d9588d 100644
--- a/content/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
+++ b/content/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account.md
@@ -3,6 +3,7 @@ title: Viewing the subscription and usage for your enterprise account
 intro: 'You can view the current {% ifversion ghec %}subscription, {% endif %}license usage{% ifversion ghec %}, invoices, payment history, and other billing information{% endif %} for {% ifversion ghec %}your enterprise account{% elsif ghes %}{% data variables.location.product_location_enterprise %}{% endif %}.'
 permissions: 'Enterprise owners {% ifversion ghec %}and billing managers {% endif %}can access and manage all billing settings for enterprise accounts.'
 redirect_from:
+  - /billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
   - /articles/viewing-the-subscription-and-usage-for-your-enterprise-account
@@ -19,19 +20,19 @@ shortTitle: View subscription & usage
 
 You can view an overview of {% ifversion ghec %}your subscription and paid{% elsif ghes %}the license{% endif %} usage for {% ifversion ghec %}your{% elsif ghes %}the{% endif %} enterprise account on {% ifversion ghec %}{% data variables.product.prodname_dotcom_the_website %}{% elsif ghes %}{% data variables.location.product_location %}{% endif %}.{% ifversion ghec %} {% data reusables.enterprise.create-an-enterprise-account %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/creating-an-enterprise-account)."{% endif %}
 
-For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %}
+For invoiced {% data variables.product.prodname_enterprise %} customers{% ifversion ghes %} who use both {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}{% endif %}, each invoice includes details about billed services for all products. For example, in addition to your usage for {% ifversion ghec %}{% data variables.product.prodname_ghe_cloud %}{% elsif ghes %}{% data variables.product.product_name %}{% endif %}, you may have usage for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghec %}, {% elsif ghes %}. You may also have usage on {% data variables.product.prodname_dotcom_the_website %}, like {% endif %}paid licenses in organizations outside of your enterprise account, data packs for {% data variables.large_files.product_name_long %}, or subscriptions to apps in {% data variables.product.prodname_marketplace %}. For more information about invoices, see "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_dotcom_the_website %} documentation.{% endif %}
 
 {% ifversion ghec %}
 
 In addition to enterprise owners, billing managers can view the subscription and usage for your enterprise account. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise#billing-manager)" and "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)."
 
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 {% endif %}
 
 {% ifversion ghes %}
 
-If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
+If you want to view an overview of your subscription and usage for {% data variables.product.prodname_enterprise %} and any related services on {% data variables.product.prodname_dotcom_the_website %}, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} documentation.
 
 {% endif %}
 
diff --git a/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
similarity index 91%
rename from content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md
rename to content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
index 312d3c7ff065..9a57a091ed00 100644
--- a/content/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise.md
+++ b/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
@@ -49,7 +49,7 @@ When you use an enterprise account on {% data variables.location.product_locatio
 
 If you use {% data variables.product.product_name %} with an individual organization and do not yet have an enterprise account, you create an enterprise account and add your organization. For more information, see "[AUTOTITLE](/admin/overview/creating-an-enterprise-account)."
 
-{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. If you use a standalone organization on {% data variables.product.product_name %}, you'll be billed at the organization level for all usage. For more information your bill's license seats, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+{% data variables.product.company_short %} bills monthly for the total number of licensed seats for your enterprise account, as well as any additional services you use with {% data variables.product.prodname_ghe_cloud %}, such as {% data variables.product.prodname_actions %} minutes. If you use a standalone organization on {% data variables.product.product_name %}, you'll be billed at the organization level for all usage. For more information your bill's license seats, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% elsif ghes %}
 
@@ -60,15 +60,15 @@ Each user on {% data variables.location.product_location %} consumes a seat on y
 {% ifversion ghec %}For {% data variables.product.prodname_ghe_cloud %} customers with an enterprise account, {% data variables.product.company_short %} bills through your enterprise account on {% data variables.product.prodname_dotcom_the_website %}. For invoiced customers, each{% elsif ghes %}For invoiced {% data variables.product.prodname_enterprise %} customers, {% data variables.product.company_short %} bills through an enterprise account on {% data variables.product.prodname_dotcom_the_website %}. Each{% endif %} invoice includes a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services and any {% data variables.product.prodname_ghe_server %} instances. For more information about {% ifversion ghes %}licensing, usage, and invoices{% elsif ghec %}usage and invoices{% endif %}, see the following{% ifversion ghes %} in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}.{% endif %}
 
 {%- ifversion ghes %}
-- "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-per-user-pricing)"
+- "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
 {%- endif %}
-- "[Viewing the subscription and usage for your enterprise account]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)"
-- "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise)"
+- "[Viewing the subscription and usage for your enterprise account]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)"
+- "[Managing invoices for your enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise)"
 
 Administrators for your enterprise account on {% data variables.product.prodname_dotcom_the_website %} can access and manage billing for the enterprise. For more information, see "[Roles in an enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
 
 {% ifversion ghec %}
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription)."
+{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 {% endif %}
 
 {% ifversion ghes %}
diff --git a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
index 1cd4ce59cbfa..2b45ff143365 100644
--- a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
+++ b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
@@ -1,6 +1,6 @@
 ---
 title: About billing on GitHub
-intro: 'Everything you purchase on {% data variables.product.prodname_dotcom %} shares your account''s billing date, payment method, and receipt.'
+intro: "Your bill is a combination of charges for your subscriptions, including your account's plan, and usage-based billing."
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
   - /articles/about-billing-on-github
@@ -12,23 +12,110 @@ type: overview
 topics:
   - Fundamentals
 ---
-## Paid features and products
 
-You can upgrade your personal account or organization to a paid subscription at any time. You can also choose to purchase apps from {% data variables.product.prodname_marketplace %} or upgrade storage and bandwidth for {% data variables.large_files.product_name_long %}. For more information, see:
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace)"
-- "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors)"
+## About billing on {% data variables.product.prodname_dotcom %}
 
-## Managing billing settings
+{% data variables.product.company_short %} bills separately for each account. This means that you will receive a separate bill for your personal account and for each organization or enterprise account you own. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-{% data reusables.sponsors.paypal-deprecation %}
+You can switch between the billing settings for each of your accounts by using the context switcher. For more information, see "[Switching between settings for your different accounts](#switching-between-settings-for-your-different-accounts)."
+
+The bill for each account is a combination of subscriptions and usage-based billing. Subscriptions include your account's plan, such as {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}, as well as paid products that have a consistent monthly cost, such as {% data variables.product.prodname_copilot %} and apps from {% data variables.product.prodname_marketplace %}.
+
+Usage-based billing applies when the cost of a paid product depends on how much you use the product. For example, the cost of {% data variables.product.prodname_actions %} depends on how many minutes your jobs spend running and how much storage your artifacts use.
 
-You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account's paid products and features. Every paid feature or product associated with an account shares a billing date, payment method, and receipt.
+Your plan may come with included amounts of usage-based products. For example, with {% data variables.product.prodname_pro %}, your personal account gets 3,000 minutes of {% data variables.product.prodname_actions %} usage for free each month. You can control usage beyond the included amounts by setting spending limits.
+
+## Included amounts by plan
+
+<table>
+  <tr>
+    <th><b>Product</b></th>
+    <th><b>Usage</b></th>
+    <th><b>{% data variables.product.prodname_free_user %}</b></th>
+    <th><b>{% data variables.product.prodname_pro %}</b></th>
+    <th><b>{% data variables.product.prodname_free_team %} for organizations</b></th>
+    <th><b>{% data variables.product.prodname_team %}</b></th>
+    <th><b>{% data variables.product.prodname_ghe_cloud %}</b></th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_actions %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</th>
+    <td>1 GB</th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>50 GB</th>
+  </tr>
+  <tr>
+    <th><b>Minutes (per month)</b></th>
+    <td>2,000</th>
+    <td>3,000</th>
+    <td>2,000</th>
+    <td>3,000</th>
+    <td>50,000</th>
+  </tr>
+   <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_github_codespaces %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>15 GB</th>
+    <td>20 GB</th>
+    <td>None</th>
+    <td>None</th>
+    <td>None</th>
+  </tr>
+  <tr>
+    <th><b>Core hours (per month)</b></th>
+    <td>120</th>
+    <td>180</th>
+    <td>None</th>
+    <td>None</th>
+    <td>None</th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.product.prodname_registry %}</b></th>
+    <th><b>Storage</b></th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>500 MB</th>
+    <td>2 GB</th>
+    <td>50 GB</th>
+  </tr>
+  <tr>
+    <th><b>Data transfer (per month)</b></th>
+    <td>1 GB</th>
+    <td>10 GB</th>
+    <td>1 GB</th>
+    <td>10 GB</th>
+    <td>100 GB</th>
+  </tr>
+  <tr>
+    <th rowspan="2" scope="rowgroup"><b>{% data variables.large_files.product_name_long %}</b></th>
+    <th><b>Storage (per month)</b></th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+  </tr>
+  <tr>
+    <th><b>Bandwidth (per month)</b></th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+    <td>1 GB</th>
+  </tr>
+</table>
+
+## Managing billing settings
+
+You must manage billing settings, payment method, and paid features and products for each of your accounts separately. You can choose to pay monthly or yearly for each account. All subscriptions and usage-based billing associated with an account shares a billing date, payment method, and receipt.
 
 {% data reusables.dotcom_billing.payment-methods %} {% data reusables.dotcom_billing.same-payment-method %}
 
-{% ifversion fpt or ghec %}For qualifying metered or consumption-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
+{% data reusables.sponsors.paypal-deprecation %}
+
+{% ifversion fpt or ghec %}For qualifying metered or usage-based services, you may choose to pay for the services from your {% data variables.product.prodname_dotcom %} account or from an Azure subscription. The terms of the billing method you choose will apply to services billed in this manner.{% endif %}
 
 For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)."
 
@@ -42,10 +129,3 @@ If you're an organization or enterprise owner, you can switch between settings f
    ![Screenshot of the "Public profile" settings page for The Octocat. Next to the text "Your personal profile," a link, labeled "Switch to another account," is outlined in orange.](/assets/images/help/settings/context-switcher-button.png)
 1. Start typing the name of the account you want to switch to, then click the name of the account.
 1. In the left sidebar, click **{% octicon "credit-card" aria-hidden="true" %} Billing and plans**.
-
-## Further reading
-
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps)"
-- "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
-- "[AUTOTITLE](/billing/managing-billing-for-github-sponsors)"
diff --git a/content/billing/managing-your-github-billing-settings/index.md b/content/billing/managing-your-github-billing-settings/index.md
index 5787936d9e4c..61a827a8cda4 100644
--- a/content/billing/managing-your-github-billing-settings/index.md
+++ b/content/billing/managing-your-github-billing-settings/index.md
@@ -14,8 +14,11 @@ redirect_from:
 versions:
   fpt: '*'
   ghec: '*'
+  ghes: '*'
+  ghae: '*'
 children:
   - /about-billing-on-github
+  - /about-billing-for-your-enterprise
   - /viewing-your-subscriptions-and-billing-date
   - /adding-or-editing-a-payment-method
   - /viewing-your-payment-history-and-receipts
diff --git a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md b/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
index e331a72d4b23..dfe95086a448 100644
--- a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
+++ b/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
@@ -25,7 +25,7 @@ shortTitle: Locked account
 
 You can unlock and access your account by updating your account's payment method and resuming paid status. We do not ask you to pay for the time elapsed in locked mode.
 
-You can downgrade your user account or organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+You can downgrade your user account or organization to {% data variables.product.prodname_free_team %} to continue with the same advanced features in public repositories. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 ## Unlocking an organization's features due to a declined payment
 
diff --git a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md b/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
index 864b61a4025e..6ef748512b73 100644
--- a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
+++ b/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
@@ -52,4 +52,4 @@ shortTitle: Subscriptions & billing date
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts)"
+- "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans)"
diff --git a/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
index 32d8ba6e208d..020de78f1b43 100644
--- a/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise.md
@@ -45,6 +45,6 @@ If you have any questions about renewing your license, contact {% data variables
 
 ## Further reading
 
-- "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - [{% data variables.product.prodname_enterprise %} Releases](https://enterprise.github.com/releases/) website
 - "[Setting up a {% data variables.product.prodname_ghe_server %} instance]({% ifversion ghec %}/enterprise-server@latest{% endif %}/admin/installation/setting-up-a-github-enterprise-server-instance)"
diff --git a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
index 9e6e780151a1..97ce296854dd 100644
--- a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
@@ -14,7 +14,7 @@ shortTitle: Troubleshoot license usage
 
 ## About unexpected license usage
 
-If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[AUTOTITLE](/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+If the number of consumed licenses for your enterprise is unexpected, you can review your consumed license report to audit your license usage across all your enterprise deployments and subscriptions. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise)" and "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 If you find errors, you can try troubleshooting steps.
 
@@ -29,7 +29,7 @@ If a user meets one or more of the following conditions, {% data variables.produ
 - The user has write access to one of your organization's private repositories.
 - The user is a {% data variables.visual_studio.prodname_vs_subscriber %}.
 
-Invitations for these roles will consume a license until the invitation is accepted or expires. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+Invitations for these roles will consume a license until the invitation is accepted or expires. For more information about the people in your enterprise who consume a license, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 For each user to consume a single seat regardless of how many deployments they use, you must synchronize license usage between {% data variables.product.prodname_ghe_server %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud)."
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
index a6f906670e9b..978c12e35dbf 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-enterprise-accounts-for-procurement-companies/creating-and-paying-for-an-enterprise-account-on-behalf-of-a-client.md
@@ -18,7 +18,7 @@ Before you start, make sure you know:
 - The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the enterprise account you create
 - The name your client would like to use for the enterprise account
 - The email address where you would like receipts to be sent
-- The number of paid seats your client would like you to purchase for the enterprise account (see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)")
+- The number of paid seats your client would like you to purchase for the enterprise account (see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)")
 
 ## Step 1: Create your personal account on {% data variables.product.prodname_dotcom %}
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
index eb4bbc7915ca..9b0aeeb73410 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/creating-and-paying-for-an-organization-on-behalf-of-a-client.md
@@ -23,8 +23,8 @@ Before you start, make sure you know:
 - The {% data variables.product.prodname_dotcom %} username of the client who will become the owner of the organization you create
 - The name your client would like to use for the organization
 - The email address where you would like receipts to be sent
-- The [product](/get-started/learning-about-github/githubs-products) your client would like to purchase
-- The number of [paid seats](/billing/managing-billing-for-your-github-account/about-per-user-pricing) your client would like you to purchase for the organization
+- The [product](/get-started/learning-about-github/githubs-plans) your client would like to purchase
+- The number of [paid seats](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing) your client would like you to purchase for the organization
 
 ## Step 1: Create your personal {% data variables.product.prodname_dotcom %} account
 
diff --git a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
index ae814945600e..7bb84db38a27 100644
--- a/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
+++ b/content/billing/setting-up-paid-accounts-for-procurement-companies/setting-up-paid-organizations-for-procurement-companies/upgrading-or-downgrading-your-clients-paid-organization.md
@@ -22,7 +22,7 @@ shortTitle: Upgrade or downgrade
 
 **Tips**:
 - Before you upgrade your client's organization, you can [view or update the payment method on file for the organization](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method).
-- These instructions are for upgrading and downgrading organizations on the _per-seat subscription_. If your client pays for {% data variables.product.product_name %} using a _legacy per-repository_ plan, you can upgrade or [downgrade](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) their legacy plan, or [switch their organization to per-seat pricing](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription).
+- These instructions are for upgrading and downgrading organizations on the _per-seat subscription_. If your client pays for {% data variables.product.product_name %} using a _legacy per-repository_ plan, you can upgrade or [downgrade](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) their legacy plan, or [switch their organization to per-seat pricing](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan).
 
 {% endtip %}
 
diff --git a/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md b/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
index 6418d5a3489f..782837a9ab6d 100644
--- a/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
+++ b/content/code-security/code-scanning/using-codeql-code-scanning-with-your-existing-ci-system/configuring-codeql-cli-in-your-ci-system.md
@@ -47,9 +47,9 @@ You can display the command-line help for any command using the <nobr>`--help`</
 1. Check out the code that you want to analyze:
     - For a branch, check out the head of the branch that you want to analyze.
     - For a pull request, check out either the head commit of the pull request, or check out a {% data variables.product.prodname_dotcom %}-generated merge commit of the pull request.
-2. Set up the environment for the codebase, making sure that any dependencies are available. For more information, see "[Creating databases for non-compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-non-compiled-languages)" and "[Creating databases for compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-compiled-languages)" in "Preparing your code for {% data variables.product.prodname_codeql %} analysis".
-3. Find the build command, if any, for the codebase. Typically this is available in a configuration file in the CI system.
-4. Run `codeql database create` from the checkout root of your repository and build the codebase.
+1. Set up the environment for the codebase, making sure that any dependencies are available. For more information, see "[Creating databases for non-compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-non-compiled-languages)" and "[Creating databases for compiled languages](/code-security/codeql-cli/getting-started-with-the-codeql-cli/preparing-your-code-for-codeql-analysis#creating-databases-for-compiled-languages)" in "Preparing your code for {% data variables.product.prodname_codeql %} analysis".
+1. Find the build command, if any, for the codebase. Typically this is available in a configuration file in the CI system.
+1. Run `codeql database create` from the checkout root of your repository and build the codebase.
 
    ```shell
    # Single supported language - create one CodeQL database
@@ -381,7 +381,7 @@ codeql database analyze codeql-dbs/python python-code-scanning.qls \
     --format=sarif-latest --sarif-category=python --output=python-results.sarif
 
 # Upload the SARIF file with the Java results: 'java-results.sarif'
-# The {% data variables.product.prodname_github_app %} or {% data variables.product.pat_generic %} created for authentication 
+# The {% data variables.product.prodname_github_app %} or {% data variables.product.pat_generic %} created for authentication
 # with {% data variables.product.company_short %}'s REST API is available in the `GITHUB_TOKEN` environment variable.
 
 codeql github upload-results \
diff --git a/content/code-security/getting-started/github-security-features.md b/content/code-security/getting-started/github-security-features.md
index cb836401a4df..042e676f5249 100644
--- a/content/code-security/getting-started/github-security-features.md
+++ b/content/code-security/getting-started/github-security-features.md
@@ -132,5 +132,5 @@ Review the security configuration and alerts for your organization and identify
 
 ## Further reading
 
-- "[AUTOTITLE](/get-started/learning-about-github/githubs-products)"
+- "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)"
 - "[AUTOTITLE](/get-started/learning-about-github/github-language-support)"
diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
index 7b7e30407d63..9ef4c78ca34e 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-github-codespaces.md
@@ -12,7 +12,7 @@ topics:
   - Security
 redirect_from:
   - /codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces
-product: 'Encrypted secrets are available in all public repositories, in private repositories owned by personal accounts, and in private repositories owned by organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plans. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."'
+product: 'Encrypted secrets are available in all public repositories, in private repositories owned by personal accounts, and in private repositories owned by organizations on {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plans. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."'
 ---
 
 ## About secrets
diff --git a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
index 2f0dd9ecfd2c..20dcca320648 100644
--- a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
@@ -25,7 +25,7 @@ Prebuilds are created using {% data variables.product.prodname_actions %}. As a
 
 You can set up prebuilds in any repository owned by a personal account. The prebuild will consume storage space that will either incur a billable charge or, for repositories owned by your personal account, will use some of your monthly included storage.
 
-For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## Configuring prebuilds
 
diff --git a/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md b/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
index 10686045faae..df447c1272b2 100644
--- a/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
+++ b/content/contributing/syntax-and-versioning-for-github-docs/using-markdown-and-liquid-in-github-docs.md
@@ -29,21 +29,20 @@ This example shows the correct way to align list items with multiple paragraphs
 ```markdown
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
-   
+
 1. This is the next item.
 ```
 
-
 This content is displayed on the {% data variables.product.prodname_docs %} site with the content under the first list item correctly aligned.
 
 ### Example list rendered on {% data variables.product.prodname_docs %}
 
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
 1. This is the next item.
@@ -139,12 +138,12 @@ For an example of an article that uses code annotations on {% data variables.pro
 
 ## Octicons
 
-Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/Octicons). 
+Octicons are icons used across {% data variables.product.prodname_dotcom %}’s interface. We reference Octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific Octicons on the [Octicons site](https://primer.style/Octicons).
 
 If you're referencing an Octicon that appears in the UI, identify whether the Octicon is the entire label of the UI element (for example, a button that is labeled only with "+") or whether it's only decorative, in addition to another label (for example, a button is labeled "+ Add message").
 
  - If the Octicon is the entire label, use your browser's developer tools to inspect the Octicon and determine what screen reader users will hear instead. Then, use that text for the `aria-label` (for example, `{% octicon "plus" aria-label="Add file" %}`). Occasionally, in the UI, the Octicon itself will not have an `aria-label`, but a surrounding element such as a `<summary>` or `<div>` tag will.
- - If the Octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the Octicon in the docs as well (for example, `"{% octicon "plus" aria-hidden="true" %} Add message"`). 
+ - If the Octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the Octicon in the docs as well (for example, `"{% octicon "plus" aria-hidden="true" %} Add message"`).
 
 If you're using the Octicon in another way, such as using the "check" and "x" icons to reflect binary values in tables, use the `aria-label` to describe the meaning of the Octicon, not its visual characteristics. For example, if you're using a "x" icon in the "Supported" column of a table, use "Not supported" as the `aria-label`. For more information, see "[AUTOTITLE](/contributing/writing-for-github-docs/style-guide#tables)."
 
@@ -325,7 +324,7 @@ If you create a table where the first column contains headers for the table rows
 | ------ | ---------------- |
 | Mona   | GitHub mascot    |
 | Tom    | Mouse antagonist |
-| Hobbes | Best friend      | 
+| Hobbes | Best friend      |
 ```
 
 ## Tables with codeblocks
diff --git a/content/contributing/writing-for-github-docs/style-guide.md b/content/contributing/writing-for-github-docs/style-guide.md
index 978db1676b81..eef4656c9444 100644
--- a/content/contributing/writing-for-github-docs/style-guide.md
+++ b/content/contributing/writing-for-github-docs/style-guide.md
@@ -1252,7 +1252,7 @@ If the reader manages an enterprise account, and you're describing the people's
 The following documentation should reference "user accounts."
 
 - The "[AUTOTITLE](/enterprise-cloud@latest/admin)" product
-- Enterprise-specific billing documentation, like "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- Enterprise-specific billing documentation, like "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - Content within other products that's intended for an administrative audience, like "[AUTOTITLE](/enterprise-cloud@latest/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)" in the "Code security" product or "[AUTOTITLE](/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" in the "Get started" product
 - Enterprise-specific API content, like the "[AUTOTITLE](/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation
 
diff --git a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
index 89ac6b0c1d17..e313fac00e62 100644
--- a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
+++ b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -41,7 +41,7 @@ The {% data variables.product.prodname_codespaces %} Education benefit gives ver
 
 To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
 
-After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-products#github-team).
+After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-plans#github-team).
 
 If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_github_codespaces %} usage. However, you can change or remove these policies in your organization settings. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
diff --git a/content/get-started/index.md b/content/get-started/index.md
index 4b251266c59d..2757f14cbc29 100644
--- a/content/get-started/index.md
+++ b/content/get-started/index.md
@@ -26,7 +26,7 @@ introLinks:
   quickstart: /get-started/quickstart
 featuredLinks:
   startHere:
-    - /get-started/learning-about-github/githubs-products
+    - /get-started/learning-about-github/githubs-plans
     - /get-started/onboarding/getting-started-with-your-github-account
     - /get-started/onboarding/getting-started-with-github-team
     - /get-started/onboarding/getting-started-with-github-enterprise-cloud
diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md
index f749ca850543..302930cc3dfa 100644
--- a/content/get-started/learning-about-github/about-github-advanced-security.md
+++ b/content/get-started/learning-about-github/about-github-advanced-security.md
@@ -18,7 +18,7 @@ shortTitle: GitHub Advanced Security
 
 {% data variables.product.prodname_dotcom %} has many features that help you improve and maintain the quality of your code. Some of these are included in all plans{% ifversion not ghae %}, such as dependency graph and {% data variables.product.prodname_dependabot_alerts %}{% endif %}. Other security features require a {% data variables.product.prodname_GH_advanced_security %} (GHAS){% ifversion fpt or ghec %} license to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}{% endif %}.
 
-{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
+{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif ghae %}There is no charge for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_managed %} during the beta release.{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
 
 {% ifversion ghec %}{% data reusables.advanced-security.ghas-trial %}{% endif %}
 
diff --git a/content/get-started/learning-about-github/about-versions-of-github-docs.md b/content/get-started/learning-about-github/about-versions-of-github-docs.md
index dec6a65f56e7..7c1f8ac50487 100644
--- a/content/get-started/learning-about-github/about-versions-of-github-docs.md
+++ b/content/get-started/learning-about-github/about-versions-of-github-docs.md
@@ -7,25 +7,25 @@ shortTitle: Docs versions
 
 ## About versions of {% data variables.product.prodname_docs %}
 
-{% data variables.product.company_short %} offers different products for storing and collaborating on code. The product you use determines which features are available to you. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+{% data variables.product.company_short %} offers different plans for storing and collaborating on code. The plan you use determines which features are available to you. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
-This website, {% data variables.product.prodname_docs %}, provides documentation for all of {% data variables.product.company_short %}'s products. If the content you're reading applies to more than one product, you can choose the version of the documentation that's relevant to you by selecting the product you're currently using.
+This website, {% data variables.product.prodname_docs %}, provides documentation for all of {% data variables.product.company_short %}'s plans. If the content you're reading applies to more than one plan, you can choose the version of the documentation that's relevant to you by selecting the plan you're currently using.
 
-At the top of a page on {% data variables.product.prodname_docs %}, select the dropdown menu and click a product. If your browser window is not wide enough to display the full navigation bar, you may need to click {% octicon "three-bars" aria-label="The three bars icon" %} first.
+At the top of a page on {% data variables.product.prodname_docs %}, select the dropdown menu and click a plan. If your browser window is not wide enough to display the full navigation bar, you may need to click {% octicon "kebab-horizontal" aria-label="Open Menu Bar" %} first.
 
 ![Screenshot of the header of {% data variables.product.prodname_docs %}. The "Version" dropdown menu is expanded and highlighted with an orange outline.](/assets/images/help/docs/version-picker.png)
 
 {% note %}
 
-**Note**: You can try changing the version now. You're viewing {% ifversion ghes %}a{% else %}the{% endif %} {% ifversion fpt %}Free, Pro, & Team{% else %}{% data variables.product.product_name %}{% endif %} version of this article.
+**Note**: You can try changing the version now. You're viewing {% ifversion ghes %}a{% else %}the{% endif %} **{% ifversion fpt %}Free, Pro, & Team{% else %}{% data variables.product.product_name %}{% endif %}** version of this article.
 
 {% endnote %}
 
 ## Determining which {% data variables.product.company_short %} product you use
 
-You can determine which {% data variables.product.company_short %} product you're currently using by reviewing the URL in the address bar of your browser and the heading for the {% data variables.product.prodname_dotcom %} website you're on.
+You can determine which {% data variables.product.company_short %} plan you're currently using by reviewing the URL in the address bar of your browser and the heading for the {% data variables.product.prodname_dotcom %} website you're on.
 
-You may use more than one {% data variables.product.company_short %} product. For example, you might contribute to open source on {% data variables.product.prodname_dotcom_the_website %} and collaborate on code on your employer's {% data variables.product.prodname_ghe_server %} instance. You may need to view different versions of the same article at different times, depending on the problem you're currently trying to solve.
+You may use more than one {% data variables.product.company_short %} plan. For example, you might contribute to open source on {% data variables.product.prodname_dotcom_the_website %} and collaborate on code on your employer's {% data variables.product.prodname_ghe_server %} instance. You may need to view different versions of the same article at different times, depending on the problem you're currently trying to solve.
 
 ### {% data variables.product.prodname_dotcom_the_website %} plans or {% data variables.product.prodname_ghe_cloud %}
 
diff --git a/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md b/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
index 4824c01d29fb..5932a37f0ae8 100644
--- a/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
+++ b/content/get-started/learning-about-github/faq-about-changes-to-githubs-plans.md
@@ -27,11 +27,11 @@ GitHub announced the following plans and pricing changes:
 
 ## How can I upgrade my plan?
 
-To upgrade your personal account's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-personal-accounts-subscription)." To upgrade your organization's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/upgrading-your-github-subscription#upgrading-your-organizations-subscription)."
+To upgrade your account's plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan)."
 
 ## How can I downgrade my plan?
 
-To downgrade your personal account's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-personal-accounts-subscription)." To downgrade your organization's plan, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-organizations-subscription)."
+To downgrade your personal account or organizations's plan, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 ## If I downgrade from GitHub Team or a Legacy plan to GitHub Free, what features will I lose?
 
@@ -64,7 +64,7 @@ Customers who are currently paying annually for Pro and Team plans and signed up
 
 ## What is the difference between GitHub Free for individual developers and GitHub Free for organizations?
 
-For details on the differences for each GitHub Free product, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For details on the differences for each GitHub Free product, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## How can I get more Actions minutes if I need more than allocated in the GitHub Team plan?
 
@@ -72,7 +72,7 @@ Most small teams use fewer than 3,000 Actions minutes/month, but some teams migh
 
 ## How do the seat limit changes affect me?
 
-Now that {% data variables.product.prodname_team %} has no minimum seat requirement, if you are using fewer than five seats in your organization, you can remove paid seats to reduce your bill. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#removing-paid-seats-from-your-organization)."
+Now that {% data variables.product.prodname_team %} has no minimum seat requirement, if you are using fewer than five seats in your organization, you can remove paid seats to reduce your bill. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan#removing-paid-seats-from-your-organization)."
 
 ## Is anything changing for teams on the GitHub Team for Open Source plan?
 
diff --git a/content/get-started/learning-about-github/githubs-products.md b/content/get-started/learning-about-github/githubs-plans.md
similarity index 85%
rename from content/get-started/learning-about-github/githubs-products.md
rename to content/get-started/learning-about-github/githubs-plans.md
index c746ccabe0e3..155cc4d18ae9 100644
--- a/content/get-started/learning-about-github/githubs-products.md
+++ b/content/get-started/learning-about-github/githubs-plans.md
@@ -1,11 +1,12 @@
 ---
-title: GitHub’s products
-intro: 'An overview of {% data variables.product.prodname_dotcom %}''s products and pricing plans.'
+title: GitHub’s plans
+intro: "An overview of {% data variables.product.prodname_dotcom %}'s pricing plans."
 redirect_from:
   - /articles/github-s-products
-  - /articles/githubs-products
-  - /github/getting-started-with-github/githubs-products
-  - /github/getting-started-with-github/learning-about-github/githubs-products
+  - /articles/githubs-plans
+  - /github/getting-started-with-github/githubs-plans
+  - /github/getting-started-with-github/learning-about-github/githubs-plans
+  - /get-started/learning-about-github/githubs-products
 versions:
   fpt: '*'
   ghes: '*'
@@ -18,13 +19,13 @@ topics:
   - Desktop
   - Security
 ---
-## About {% data variables.product.prodname_dotcom %}'s products
+## About {% data variables.product.prodname_dotcom %}'s plans
 
-{% data variables.product.prodname_dotcom %} offers free and paid products for storing and collaborating on code. Some products apply only to personal accounts, while other plans apply only to organization and enterprise accounts. For more information about accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
+{% data variables.product.prodname_dotcom %} offers free and paid plans for storing and collaborating on code. Some plans are available only to personal accounts, while other plans are available only to organization and enterprise accounts. For more information about accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-See costs and features for each product at {% data variables.product.pricing_link %}. {% data reusables.products.product-roadmap %}
+See costs and features for each plan at {% data variables.product.pricing_link %}. {% data reusables.products.product-roadmap %}
 
-When you read {% data variables.product.prodname_docs %}, make sure to select the version that reflects your product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs)."
+When you read {% data variables.product.prodname_docs %}, make sure to select the version that reflects your plan. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-versions-of-github-docs)."
 
 ## {% data variables.product.prodname_free_user %} for personal accounts
 
@@ -93,7 +94,7 @@ In addition to the features available with {% data variables.product.prodname_fr
   - Organization owners can choose to enable or disable {% data variables.product.prodname_github_codespaces %} for the organization's private {% ifversion ghec %}and internal {% endif %}repositories, and can pay for the usage of members and collaborators. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization)" and [AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)."
 {%- endif %}
 
-{% data variables.product.company_short %} bills for {% data variables.product.prodname_team %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not fpt %}/free-pro-team@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing){% ifversion fpt %}."{% else %}" in the Free, Pro, & Team documentation.{% endif %}
+{% data variables.product.company_short %} bills for {% data variables.product.prodname_team %} on a per-user basis. For more information, see "[About per-user pricing]({% ifversion not fpt %}/free-pro-team@latest{% endif %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing){% ifversion fpt %}."{% else %}" in the Free, Pro, & Team documentation.{% endif %}
 
 {% data reusables.actions.actions-billing %}
 
@@ -124,4 +125,4 @@ You can set up trials to evaluate {% data variables.product.prodname_ghe_cloud %
 
 ## Further reading
 
-- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-billing-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
+- "[About per-user pricing]({% ifversion not ghec %}/enterprise-cloud@latest{% endif %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"{% ifversion not ghec %} in the {% data variables.product.prodname_ghe_cloud %} documentation{% endif %}
diff --git a/content/get-started/learning-about-github/index.md b/content/get-started/learning-about-github/index.md
index 5861d232ae62..0ccdcbf2aafe 100644
--- a/content/get-started/learning-about-github/index.md
+++ b/content/get-started/learning-about-github/index.md
@@ -16,7 +16,7 @@ topics:
   - Desktop
   - Security
 children:
-  - /githubs-products
+  - /githubs-plans
   - /about-versions-of-github-docs
   - /github-language-support
   - /types-of-github-accounts
@@ -24,4 +24,3 @@ children:
   - /about-github-advanced-security
   - /faq-about-changes-to-githubs-plans
 ---
-
diff --git a/content/get-started/learning-about-github/types-of-github-accounts.md b/content/get-started/learning-about-github/types-of-github-accounts.md
index dd169042d471..3877a17c5fc0 100644
--- a/content/get-started/learning-about-github/types-of-github-accounts.md
+++ b/content/get-started/learning-about-github/types-of-github-accounts.md
@@ -37,7 +37,7 @@ Every person who uses {% data variables.location.product_location %} signs into
 
 Your personal account can own resources such as repositories, packages, and projects. Any time you take any action on {% data variables.location.product_location %}, such as creating an issue or reviewing a pull request, the action is attributed to your personal account.
 
-{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %}
+{% ifversion fpt or ghec %}Each personal account uses either {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %}. All personal accounts can own an unlimited number of public and private repositories, with an unlimited number of collaborators on those repositories. If you use {% data variables.product.prodname_free_user %}, private repositories owned by your personal account have a limited feature set. You can upgrade to {% data variables.product.prodname_pro %} to get a full feature set for private repositories. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)." {% else %}You can create an unlimited number of repositories owned by your personal account, with an unlimited number of collaborators on those repositories.{% endif %}
 
 {% tip %}
 
diff --git a/content/get-started/onboarding/getting-started-with-github-ae.md b/content/get-started/onboarding/getting-started-with-github-ae.md
index 18e1a83f0f65..dc9e361e1781 100644
--- a/content/get-started/onboarding/getting-started-with-github-ae.md
+++ b/content/get-started/onboarding/getting-started-with-github-ae.md
@@ -31,7 +31,7 @@ You can centrally manage access to {% data variables.location.product_location %
 
 ### 5. Managing billing for {% data variables.location.product_location %}
 
-Owners of the subscription for {% data variables.location.product_location %} on {% data variables.product.product_name %} can view billing details for {% data variables.product.product_name %} in the Azure portal. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+Owners of the subscription for {% data variables.location.product_location %} on {% data variables.product.product_name %} can view billing details for {% data variables.product.product_name %} in the Azure portal. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 ## Part 2: Organizing and managing enterprise members
 
diff --git a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
index 0671f26d2ff9..80f4fcc49d5d 100644
--- a/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
+++ b/content/get-started/onboarding/getting-started-with-github-enterprise-cloud.md
@@ -39,7 +39,7 @@ You can add any number of new or existing organizations to manage within your en
 
 #### 4. Viewing the subscription and usage for your enterprise account
 
-You can view your current subscription, license usage, invoices, payment history, and other billing information for your enterprise account at any time. Both enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see  "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
+You can view your current subscription, license usage, invoices, payment history, and other billing information for your enterprise account at any time. Both enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see  "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account)."
 
 ## Part 2: Managing your enterprise members with {% data variables.product.prodname_ghe_cloud %}
 
diff --git a/content/get-started/onboarding/getting-started-with-github-enterprise-server.md b/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
index bdb982afa42a..a7a0bff8c916 100644
--- a/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
+++ b/content/get-started/onboarding/getting-started-with-github-enterprise-server.md
@@ -52,7 +52,7 @@ To protect your production data, you can configure automated backups of {% data
 
 ### 8. Managing billing for your enterprise
 
-Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom %}.com services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)."
+Billing for all the organizations and {% data variables.product.product_name %} instances connected to your enterprise account is aggregated into a single bill charge for all of your paid {% data variables.product.prodname_dotcom_the_website %} services. Enterprise owners and billing managers can access and manage billing settings for enterprise accounts. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)."
 
 ## Part 2: Organizing and managing your team
 
diff --git a/content/get-started/onboarding/getting-started-with-your-github-account.md b/content/get-started/onboarding/getting-started-with-your-github-account.md
index f110e9772d85..2b9efe39ddc7 100644
--- a/content/get-started/onboarding/getting-started-with-your-github-account.md
+++ b/content/get-started/onboarding/getting-started-with-your-github-account.md
@@ -34,7 +34,7 @@ To keep your {% data variables.product.prodname_dotcom %} account secure you sho
 
 You can choose {% data variables.product.prodname_free_user %} or {% data variables.product.prodname_pro %} to get access to different features for your personal account. You can upgrade at any time if you are unsure at first which product you want.
 
-For more information on all of {% data variables.product.prodname_dotcom %}'s plans, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+For more information on all of {% data variables.product.prodname_dotcom %}'s plans, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ### 3. Verifying your email address
 
diff --git a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
index 9f1b36ee5512..50c8c52ed78f 100644
--- a/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
+++ b/content/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud.md
@@ -79,7 +79,7 @@ You can finish your trial at any time by purchasing {% data variables.product.pr
 
 Purchasing {% data variables.product.prodname_enterprise %} ends your trial, removing the 50-seat maximum and initiating payment.
 
-If you cancel your trial or your trial expires, any existing organizations that you added to the enterprise account during the trial will be removed and reverted to their previous plans and settings. For more information about the effects of downgrading an organization, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription#downgrading-your-organizations-subscription)."
+If you cancel your trial or your trial expires, any existing organizations that you added to the enterprise account during the trial will be removed and reverted to their previous plans and settings. For more information about the effects of downgrading an organization, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan#downgrading-your-organizations-plan)."
 
 If you cancel your trial, all enterprise owners and members also lose access to the enterprise account and any organizations that were created during the trial. If your trial expires, everyone retains access to the enterprise account and organizations created during the trial in a downgraded state, giving you a chance to either upgrade to {% data variables.product.prodname_enterprise %} or move your assets elsewhere.
 
diff --git a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
index e9129e422308..87e87576c67e 100644
--- a/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
+++ b/content/get-started/signing-up-for-github/signing-up-for-a-new-github-account.md
@@ -17,7 +17,7 @@ topics:
 
 You can create a personal account, which serves as your identity on {% data variables.product.prodname_dotcom_the_website %}, or an organization, which allows multiple personal accounts to collaborate across multiple projects. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+When you create a personal account or organization, you must select a billing plan for the account. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## Signing up for a new account
 
diff --git a/content/get-started/using-github/github-mobile.md b/content/get-started/using-github/github-mobile.md
index 54f7d08a4673..d3ffb2c10260 100644
--- a/content/get-started/using-github/github-mobile.md
+++ b/content/get-started/using-github/github-mobile.md
@@ -39,7 +39,7 @@ To install {% data variables.product.prodname_mobile %} for Android or iOS, see
 
 ## Managing accounts
 
-You can be simultaneously signed into mobile with one personal account on {% data variables.product.prodname_dotcom_the_website %} and one personal account on {% data variables.product.prodname_ghe_server %}. For more information about our different products, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+You can be simultaneously signed into mobile with one personal account on {% data variables.product.prodname_dotcom_the_website %} and one personal account on {% data variables.product.prodname_ghe_server %}. For more information about our different products, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% data reusables.mobile.push-notifications-on-ghes %}
 
diff --git a/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
index 694b61863b42..4bccc1ebbf8b 100644
--- a/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
+++ b/content/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch.md
@@ -21,7 +21,7 @@ When you create a new organization from scratch, it doesn't have any repositorie
 {% data reusables.user-settings.access_settings %}
 {% data reusables.user-settings.organizations %}
 {% data reusables.organizations.new-organization %}
-1. Follow the prompts to create your organization. {% ifversion fpt or ghec %}For more information about the plans available for your team, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+1. Follow the prompts to create your organization. {% ifversion fpt or ghec %}For more information about the plans available for your team, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)s)."{% endif %}
 
 ## Further reading
 
diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
index 8443cbb873f4..58c8c59ca31a 100644
--- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/audit-log-events-for-your-organization.md
@@ -26,8 +26,8 @@ shortTitle: Audit log events
 | Action | Description
 |------------------|-------------------
 | `billing_plan_change` | Triggered when an organization's [billing cycle](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle) changes.
-| `plan_change` | Triggered when an organization's [subscription](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) changes.
-| `pending_plan_change` | Triggered when an organization owner or billing manager [cancels or downgrades a paid subscription](/billing/managing-billing-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process).
+| `plan_change` | Triggered when an organization's [plan](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans) changes.
+| `pending_plan_change` | Triggered when an organization owner or billing manager [cancels or downgrades a paid subscription](/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process).
 | `pending_subscription_change` | Triggered when a [{% data variables.product.prodname_marketplace %} free trial starts or expires](/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace).
 {% endif %}
 
diff --git a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
index fc50fffca9c2..1cf8aba79973 100644
--- a/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization.md
@@ -29,7 +29,7 @@ If an invitee's personal account has been flagged, the invitee won't be able to
 
 {% endnote %}
 
-If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."
+If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."
 
 {% data reusables.organizations.org-invite-scim %}
 
diff --git a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
index 6ebae81b1a29..81f9a475ce57 100644
--- a/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
+++ b/content/organizations/managing-membership-in-your-organization/removing-a-member-from-your-organization.md
@@ -24,7 +24,7 @@ permissions: Organization owners can remove members from an organization.
 {% warning %}
 
 **Warning:** When you remove members from an organization:
-- The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- The paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 - Removed members will lose access to private forks of your organization's private repositories, but they may still have local copies. However, they cannot sync local copies with your organization's repositories. Their private forks can be restored if the user is [reinstated as an organization member](/organizations/managing-membership-in-your-organization/reinstating-a-former-member-of-your-organization) within three months of being removed from the organization. Ultimately, you are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.
 - When private repositories are forked to other organizations, those organizations are able to control access to the fork network. This means users may retain access to the forks even after losing access to the original organization because they will still have explicit access via a fork.
 {%- ifversion ghec %}
diff --git a/content/organizations/managing-organization-settings/deleting-an-organization-account.md b/content/organizations/managing-organization-settings/deleting-an-organization-account.md
index cfa3fb57b0d7..ea74e178b97c 100644
--- a/content/organizations/managing-organization-settings/deleting-an-organization-account.md
+++ b/content/organizations/managing-organization-settings/deleting-an-organization-account.md
@@ -21,7 +21,7 @@ shortTitle: Delete organization
 {% ifversion fpt or ghec %}
 {% tip %}
 
-**Tip**: If you want to cancel your paid subscription, you can [downgrade your organization to {% data variables.product.prodname_free_team %}](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) instead of deleting the organization and its content.
+**Tip**: If you want to cancel your paid subscription, you can [downgrade your organization to {% data variables.product.prodname_free_team %}](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) instead of deleting the organization and its content.
 
 {% endtip %}
 
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md b/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
index ca6d6a5fa44d..f02e17bf6df6 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/converting-an-outside-collaborator-to-an-organization-member.md
@@ -17,7 +17,7 @@ topics:
 shortTitle: Convert collaborator to member
 ---
 {% ifversion fpt or ghec %}
-If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %}
+If your organization is on a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)." {% data reusables.organizations.org-invite-expiration %}{% endif %}
 
 {% ifversion not ghae %}
 If your organization [requires members to use two-factor authentication](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/requiring-two-factor-authentication-in-your-organization), users {% ifversion fpt or ghec %}you invite must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) before they can accept the invitation.{% else %}must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) before you can add them to the organization.{% endif %}
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md b/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
index e33e159332ac..70b53792e589 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/reinstating-a-former-outside-collaborators-access-to-your-organization.md
@@ -36,7 +36,7 @@ When you reinstate a former outside collaborator, you can restore:
 
 - Only organization owners can reinstate outside collaborators' access to an organization.{% ifversion prevent-org-admin-add-outside-collaborator %} Enterprise owners may further restrict the ability to reinstate outside collaborators' access to enterprise owners only.{% endif %} For more information, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."
 - The reinstating a member flow on {% data variables.location.product_location %} may use the term "member" to describe reinstating an outside collaborator but if you reinstate this person and keep their previous privileges, they will only have their previous [outside collaborator permissions](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators).{% ifversion fpt or ghec %}
-- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/about-per-user-pricing)."{% endif %}
+- If your organization has a paid per-user subscription, an unused license must be available before you can invite a new member to join the organization or reinstate a former organization member. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)."{% endif %}
 
 {% endtip %}
 
diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md b/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
index 0fff5baa41d2..6eb007fc42d9 100644
--- a/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
+++ b/content/organizations/managing-user-access-to-your-organizations-repositories/removing-an-outside-collaborator-from-an-organization-repository.md
@@ -21,7 +21,7 @@ shortTitle: Remove collaborator
 {% warning %}
 
 **Warning:**
-- When removing an outside collaborator from a private repository, the paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- When removing an outside collaborator from a private repository, the paid license count does not automatically downgrade. To pay for fewer licenses after removing users from your organization, follow the steps in "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 
 - You are responsible for ensuring that people who have lost access to a repository delete any confidential information or intellectual property.
 
diff --git a/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
index dacf09f21ae4..2917ad7f8892 100644
--- a/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
+++ b/content/pages/configuring-a-custom-domain-for-your-github-pages-site/about-custom-domains-and-github-pages.md
@@ -70,7 +70,7 @@ An apex domain is configured with an `A`, `ALIAS`, or `ANAME` record through you
 
 There are a couple of reasons your site might be automatically disabled.
 
-- If you downgrade from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, any {% data variables.product.prodname_pages %} sites that are currently published from private repositories in your account will be unpublished. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription)."
+- If you downgrade from {% data variables.product.prodname_pro %} to {% data variables.product.prodname_free_user %}, any {% data variables.product.prodname_pages %} sites that are currently published from private repositories in your account will be unpublished. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan)."
 - If you transfer a private repository to a personal account that is using {% data variables.product.prodname_free_user %}, the repository will lose access to the {% data variables.product.prodname_pages %} feature, and the currently published {% data variables.product.prodname_pages %} site will be unpublished. For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/transferring-a-repository)."
 
 ## Further reading
diff --git a/content/repositories/archiving-a-github-repository/archiving-repositories.md b/content/repositories/archiving-a-github-repository/archiving-repositories.md
index 65440effeeeb..4097d20e1a1f 100644
--- a/content/repositories/archiving-a-github-repository/archiving-repositories.md
+++ b/content/repositories/archiving-a-github-repository/archiving-repositories.md
@@ -22,7 +22,7 @@ topics:
 {% ifversion fpt or ghec %}
 {% note %}
 
-**Note:** If you have a legacy per-repository billing plan, you will still be charged for your archived repository. If you don't want to be charged for an archived repository, you must upgrade to a new product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+**Note:** If you have a legacy per-repository billing plan, you will still be charged for your archived repository. If you don't want to be charged for an archived repository, you must upgrade to a new product. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 {% endnote %}
 {% endif %}
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
index a5aa766e1942..a087e24c0cef 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility.md
@@ -50,16 +50,13 @@ We recommend reviewing the following caveats before you change the visibility of
 {%- ifversion ghes or ghec or ghae %}
 - If you change a repository's visibility from internal to private, {% data variables.product.prodname_dotcom %} will remove forks that belong to any user without access to the newly private repository. {% ifversion fpt or ghes or ghec %}The visibility of any forks will also change to private.{% elsif ghae %}If the internal repository has any forks, the visibility of the forks is already private.{% endif %} For more information, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/working-with-forks/what-happens-to-forks-when-a-repository-is-deleted-or-changes-visibility)"
 {%- endif %}
-
 {%- ifversion fpt %}
-- If you're using {% data variables.product.prodname_free_user %} for personal accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products) and "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
+- If you're using {% data variables.product.prodname_free_user %} for personal accounts or organizations, some features won't be available in the repository after you change the visibility to private. Any published {% data variables.product.prodname_pages %} site will be automatically unpublished. If you added a custom domain to the {% data variables.product.prodname_pages %} site, you should remove or update your DNS records before making the repository private, to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans) and "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."
 {%- endif %}
-
 {%- ifversion fpt or ghec %}
 - {% data variables.product.prodname_dotcom %} will no longer include the repository in the {% data variables.product.prodname_archive %}. For more information, see "[AUTOTITLE](/repositories/archiving-a-github-repository/about-archiving-content-and-data-on-github#about-the-github-archive-program)."
 - {% data variables.product.prodname_GH_advanced_security %} features, such as {% data variables.product.prodname_code_scanning %}, will stop working{% ifversion ghec %} unless the repository is owned by an organization that is part of an enterprise with a license for {% data variables.product.prodname_advanced_security %} and sufficient spare seats{% endif %}. {% data reusables.advanced-security.more-info-ghas %}
 {%- endif %}
-
 {%- ifversion ghes %}
 - Anonymous Git read access is no longer available. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/enabling-anonymous-git-read-access-for-a-repository)."
 {%- endif %}
diff --git a/content/rest/scim/scim.md b/content/rest/scim/scim.md
index 17c40eef6f8c..0dc125624122 100644
--- a/content/rest/scim/scim.md
+++ b/content/rest/scim/scim.md
@@ -21,7 +21,7 @@ These endpoints are used by SCIM-enabled Identity Providers (IdPs) to automate p
 {% note %}
 
 **Notes:**
-- These endpoints are only available for individual organizations that use [{% data variables.product.prodname_ghe_cloud %}](/billing/managing-billing-for-your-github-account/about-billing-for-github-accounts) with SAML SSO enabled. For more information about SCIM, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)." For more information about authorizing a token for a SAML SSO organization, see "[AUTOTITLE](/rest/overview/authenticating-to-the-rest-api)."
+- These endpoints are only available for individual organizations that use {% data variables.product.prodname_ghe_cloud %} with SAML SSO enabled. For more information about SCIM, see "[AUTOTITLE](/enterprise-cloud@latest/organizations/managing-saml-single-sign-on-for-your-organization/about-scim-for-organizations)." For more information about authorizing a token for a SAML SSO organization, see "[AUTOTITLE](/rest/overview/authenticating-to-the-rest-api)."
 - These endpoints cannot be used with an enterprise account or with an {% data variables.enterprise.prodname_emu_org %}.
 
 {% endnote %}
diff --git a/content/site-policy/github-terms/github-terms-of-service.md b/content/site-policy/github-terms/github-terms-of-service.md
index 2e81e585e7aa..972d93324157 100644
--- a/content/site-policy/github-terms/github-terms-of-service.md
+++ b/content/site-policy/github-terms/github-terms-of-service.md
@@ -78,7 +78,7 @@ We have a few simple rules for Personal Accounts on GitHub's Service.
 - One person or legal entity may maintain no more than one free Account (if you choose to control a machine account as well, that's fine, but it can only be used for running a machine).
 - You must be age 13 or older. While we are thrilled to see brilliant young coders get excited by learning to program, we must comply with United States law. GitHub does not target our Service to children under 13, and we do not permit any Users under 13 on our Service. If we learn of any User under the age of 13, we will [terminate that User’s Account immediately](#l-cancellation-and-termination). If you are a resident of a country outside the United States, your country’s minimum age may be older; in such a case, you are responsible for complying with your country’s laws.
 - Your login may only be used by one person — i.e., a single login may not be shared by multiple people. A paid Organization may only provide access to as many Personal Accounts as your subscription allows.
-- You may not use GitHub in violation of export control or sanctions laws of the United States or any other applicable jurisdiction. You may not use GitHub if you are or are working on behalf of a [Specially Designated National (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx) or a person subject to similar blocking or denied party prohibitions administered by a U.S. government agency.  GitHub may allow persons in certain sanctioned countries or territories to access certain GitHub services pursuant to U.S. government authorizations.  For more information, please see our [Export Controls policy](/site-policy/other-site-policies/github-and-trade-controls).  
+- You may not use GitHub in violation of export control or sanctions laws of the United States or any other applicable jurisdiction. You may not use GitHub if you are or are working on behalf of a [Specially Designated National (SDN)](https://www.treasury.gov/resource-center/sanctions/SDN-List/Pages/default.aspx) or a person subject to similar blocking or denied party prohibitions administered by a U.S. government agency.  GitHub may allow persons in certain sanctioned countries or territories to access certain GitHub services pursuant to U.S. government authorizations.  For more information, please see our [Export Controls policy](/site-policy/other-site-policies/github-and-trade-controls).
 
 ### 4. Account Security
 
@@ -267,7 +267,7 @@ You are responsible for all fees, including taxes, associated with your use of t
 
 ### 1. Account Cancellation
 
-It is your responsibility to properly cancel your Account with GitHub. You can [cancel your Account at any time](/billing/managing-billing-for-your-github-account/downgrading-your-github-subscription) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel Accounts in response to an email or phone request.
+It is your responsibility to properly cancel your Account with GitHub. You can [cancel your Account at any time](/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan) by going into your Settings in the global navigation bar at the top of the screen. The Account screen provides a simple, no questions asked cancellation link. We are not able to cancel Accounts in response to an email or phone request.
 
 ### 2. Upon Cancellation
 
diff --git a/content/support/learning-about-github-support/about-github-support.md b/content/support/learning-about-github-support/about-github-support.md
index 3150dac97e64..b70d71b74c82 100644
--- a/content/support/learning-about-github-support/about-github-support.md
+++ b/content/support/learning-about-github-support/about-github-support.md
@@ -39,7 +39,6 @@ The support options available to {% data variables.product.prodname_dotcom %} us
 | {% data variables.product.prodname_ghe_cloud %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "check" aria-label="Available" %} | Available to purchase |
 | {% data variables.product.prodname_ghe_server %} | {% octicon "check" aria-label="Available" %} | {% octicon "x" aria-label="Not available" %} | {% octicon "check" aria-label="Available" %} | Available to purchase |
 
-
 {% endrowheaders %}
 
 {% endif %}
diff --git a/contributing/content-markup-reference.md b/contributing/content-markup-reference.md
index abeb099d3745..d79be582fa5b 100644
--- a/contributing/content-markup-reference.md
+++ b/contributing/content-markup-reference.md
@@ -40,7 +40,7 @@ For example, this is the correct way to write list items with multiple paragraph
 ```markdown
 1. Under your repository name, click **Actions**.
 
-   ![Actions tab in the main repository navigation](/assets/images/help/repository/actions-tab.png)
+   ![Screenshot of the tabs for the "github/docs" repository. The "Actions" tab is highlighted with an orange outline.](/assets/images/help/repository/actions-tab.png)
 
    This is another paragraph in the list.
 1. This is the next item.
@@ -119,12 +119,12 @@ You can also add a header that includes the name of the language and a button to
 
 ## Octicons
 
-Octicons are icons used across GitHub’s interface. We reference octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific octicons on the [Octicons site](https://primer.style/octicons). 
+Octicons are icons used across GitHub’s interface. We reference octicons when documenting the user interface and to indicate binary values in tables. Find the name of specific octicons on the [Octicons site](https://primer.style/octicons).
 
 If you're referencing an octicon that appears in the UI, identify whether the octicon is the entire label of the UI element (e.g., a button that is labeled only with "+") or whether it's only decorative, in addition to another label (e.g., a button is labeled "+ Add message").
 
  - If the octicon is the entire label, use your browser's developer tools to inspect the octicon and determine what screen reader users will hear instead. Then, use that text for the `aria-label` (e.g., `{% octicon "plus" aria-label="Add file" %}`). Occasionally, in the UI, the octicon itself will not have an `aria-label`, but a surrounding element such as a `<summary>` or `<div>` tag will.
- - If the octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the octicon in the docs as well (e.g., `"{% octicon "plus" aria-hidden="true" %} Add message"`). 
+ - If the octicon is decorative, it's likely hidden to screen readers with the `aria-hidden=true` attribute. If so, for consistency with the product, use `aria-hidden="true"` in the Liquid syntax for the octicon in the docs as well (e.g., `"{% octicon "plus" aria-hidden="true" %} Add message"`).
 
 If you're using the octicon in another way, such as using the "check" and "x" icons to reflect binary values in tables, use the `aria-label` to describe the meaning of the octicon, not its visual characteristics. For example, if you're using a "x" icon in the "Supported" column of a table, use "Not supported" as the `aria-label`. For more information, see [Tables](./content-style-guide.md#use-clear-consistent-symbols-and-labels) in the style guide.
 
@@ -305,7 +305,7 @@ If you create a table where the first column contains headers for the table rows
 | --- | --- |
 | Mona | GitHub mascot |
 | Tom | Mouse antagonist |
-| Hobbes | Best friend | 
+| Hobbes | Best friend |
 ```
 
 ## Tables with codeblocks
diff --git a/contributing/content-style-guide.md b/contributing/content-style-guide.md
index 36c6b3e292ff..caecfdc967ae 100644
--- a/contributing/content-style-guide.md
+++ b/contributing/content-style-guide.md
@@ -1240,7 +1240,7 @@ If the reader manages an enterprise account, and you're describing the people's
 The following documentation should reference "user accounts."
 
 - The "[Enterprise administrators](https://docs.github.com/en/enterprise-cloud@latest/admin)" product
-- Enterprise-specific billing documentation, like "[About billing for your enterprise](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise)"
+- Enterprise-specific billing documentation, like "[About billing for your enterprise](https://docs.github.com/en/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise)"
 - Content within other products that's intended for an administrative audience, like "[Best practices for securing accounts](https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/end-to-end-supply-chain/securing-accounts)" in the "Code security" product or "[Setting up a trial of GitHub Enterprise Cloud](https://docs.github.com/en/enterprise-cloud@latest/get-started/signing-up-for-github/setting-up-a-trial-of-github-enterprise-cloud)" in the "Get started" product
 - Enterprise-specific API content, like the "[GitHub Enterprise administration](https://docs.github.com/en/enterprise-cloud@latest/rest/reference/enterprise-admin)" REST API reference documentation
 
diff --git a/data/learning-tracks/admin.yml b/data/learning-tracks/admin.yml
index 1551b86ac5d2..3d523a5006fc 100644
--- a/data/learning-tracks/admin.yml
+++ b/data/learning-tracks/admin.yml
@@ -190,7 +190,7 @@ get_started_with_your_enterprise_account:
   guides:
     - /admin/overview/about-enterprise-accounts
     - >-
-      /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+      /billing/managing-the-plan-for-your-github-account/about-billing-for-your-enterprise
     - >-
       /admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
     - >-
diff --git a/data/reusables/actions/actions-billing.md b/data/reusables/actions/actions-billing.md
index 453bd9ef77d0..c5cd232c1dfa 100644
--- a/data/reusables/actions/actions-billing.md
+++ b/data/reusables/actions/actions-billing.md
@@ -1 +1 @@
-{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the product used with the account. Any usage beyond the included amounts is controlled by spending limits.
+{% data variables.product.prodname_actions %} usage is free for standard {% data variables.product.prodname_dotcom %}-hosted runners in public repositories, and for self-hosted runners. For private repositories, each {% data variables.product.prodname_dotcom %} account receives a certain amount of free minutes and storage for use with {% data variables.product.prodname_dotcom %}-hosted runners, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.
diff --git a/data/reusables/actions/actions-packages-set-spending-limit.md b/data/reusables/actions/actions-packages-set-spending-limit.md
index e315a34bc87d..6b2fc3b9f74f 100644
--- a/data/reusables/actions/actions-packages-set-spending-limit.md
+++ b/data/reusables/actions/actions-packages-set-spending-limit.md
@@ -1 +1 @@
-You can set a specific spending limit or, for some accounts, allow unlimited spending. The spending limit applies to your combined overages for {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %}.
+You can set a specific spending limit or, for some accounts, allow unlimited spending. The spending limit applies to your combined overages (any usage beyond the amounts included with your plan) for {% data variables.product.prodname_registry %} and {% data variables.product.prodname_actions %}.
diff --git a/data/reusables/billing/about-billing.md b/data/reusables/billing/about-billing.md
new file mode 100644
index 000000000000..b16f64c1db68
--- /dev/null
+++ b/data/reusables/billing/about-billing.md
@@ -0,0 +1 @@
+The bill for each account on {% data variables.product.product_name %} consists of the account's plan, plus other any other subscriptions and usage-based billing for the account.
\ No newline at end of file
diff --git a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
index f1632e7828cd..ee913c87338f 100644
--- a/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
+++ b/data/reusables/copilot/signup-procedure-enterprise-msft-ea.md
@@ -1 +1 @@
-As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-billing-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)."
+As a customer under a Microsoft Enterprise Agreement, you need to connect your Azure subscription ID to your enterprise account to enable and pay for {% data variables.product.prodname_copilot %}, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription-to-your-enterprise)."
diff --git a/data/reusables/dotcom_billing/same-payment-method.md b/data/reusables/dotcom_billing/same-payment-method.md
index d0e7e1e87249..339b546fdbce 100644
--- a/data/reusables/dotcom_billing/same-payment-method.md
+++ b/data/reusables/dotcom_billing/same-payment-method.md
@@ -1 +1 @@
-When you update your payment method for your account's {% data variables.product.prodname_dotcom %} subscription, your new payment method is automatically added to your other subscriptions for paid products.
+When you update the payment method for your account's plan, your new payment method is automatically added to your other subscriptions and usage-based billing.
diff --git a/data/reusables/education/apply-for-team.md b/data/reusables/education/apply-for-team.md
index 2c60c6e3e0ba..01b1391c92be 100644
--- a/data/reusables/education/apply-for-team.md
+++ b/data/reusables/education/apply-for-team.md
@@ -1 +1 @@
-- Apply for free [{% data variables.product.prodname_team %}](/get-started/learning-about-github/githubs-products), which allows unlimited users and private repositories. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+- Apply for free [{% data variables.product.prodname_team %}](/get-started/learning-about-github/githubs-plans), which allows unlimited users and private repositories. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
diff --git a/data/reusables/enterprise-accounts/billing-azure-subscription.md b/data/reusables/enterprise-accounts/billing-azure-subscription.md
index 8b3ebfe53aa6..0fc87e36da51 100644
--- a/data/reusables/enterprise-accounts/billing-azure-subscription.md
+++ b/data/reusables/enterprise-accounts/billing-azure-subscription.md
@@ -1 +1,5 @@
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for any {% data variables.product.prodname_dotcom %} metered services. For example, {% data variables.product.prodname_github_codespaces %} usage, and for {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} usage, beyond the amounts included with your account, or {% data variables.product.prodname_copilot_business_short %}.
+You can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise account{% endif%} to enable and pay for any {% data variables.product.prodname_dotcom %} metered services. For example:
+
+- {% data variables.product.prodname_github_codespaces %} usage
+- {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} overages (usage beyond the amounts included with your plan)
+- {% data variables.product.prodname_copilot_business_short %}
diff --git a/data/reusables/enterprise/about-deployment-methods.md b/data/reusables/enterprise/about-deployment-methods.md
index 808bb4975646..a239d704c5ce 100644
--- a/data/reusables/enterprise/about-deployment-methods.md
+++ b/data/reusables/enterprise/about-deployment-methods.md
@@ -1 +1 @@
-{% data variables.product.prodname_enterprise %} offers two deployment options. {% ifversion fpt or ghec %}In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or a supported cloud.{% elsif ghes %}In addition to {% data variables.product.product_name %}, you can use {% data variables.product.prodname_ghe_cloud %} to host development work for your enterprise on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products#github-enterprise)."
+{% data variables.product.prodname_enterprise %} offers two deployment options. {% ifversion fpt or ghec %}In addition to {% data variables.product.prodname_ghe_cloud %}, you can use {% data variables.product.prodname_ghe_server %} to host development work for your enterprise in your data center or a supported cloud.{% elsif ghes %}In addition to {% data variables.product.product_name %}, you can use {% data variables.product.prodname_ghe_cloud %} to host development work for your enterprise on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans#github-enterprise)."
diff --git a/data/reusables/gated-features/code-review-assignment.md b/data/reusables/gated-features/code-review-assignment.md
index 83ac3e8642c5..7aef2ecce705 100644
--- a/data/reusables/gated-features/code-review-assignment.md
+++ b/data/reusables/gated-features/code-review-assignment.md
@@ -1 +1 @@
-Code review settings are available in all public repositories owned by an organization, and all private repositories owned by organizations on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Code review settings are available in all public repositories owned by an organization, and all private repositories owned by organizations on {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/codespaces-org.md b/data/reusables/gated-features/codespaces-org.md
index 5995c048b434..bef77b6c2727 100644
--- a/data/reusables/gated-features/codespaces-org.md
+++ b/data/reusables/gated-features/codespaces-org.md
@@ -1 +1 @@
-Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access settings and policies to manage codespaces paid for by the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization#about-ownership-of-codespaces)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
\ No newline at end of file
+Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access settings and policies to manage codespaces paid for by the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization#about-ownership-of-codespaces)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/codespaces-repo.md b/data/reusables/gated-features/codespaces-repo.md
index a848044e89c7..412e974d12e4 100644
--- a/data/reusables/gated-features/codespaces-repo.md
+++ b/data/reusables/gated-features/codespaces-repo.md
@@ -1,3 +1,3 @@
 Repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for all repositories owned by personal accounts. <br><br>
 
-For repositories owned by organizations, repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans. To access the settings, the organization or its parent enterprise must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
\ No newline at end of file
+For repositories owned by organizations, repository-level settings for {% data variables.product.prodname_github_codespaces %} are available for organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans. To access the settings, the organization or its parent enterprise must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/display-names.md b/data/reusables/gated-features/display-names.md
index fd4c994e7b60..f6602a3a22af 100644
--- a/data/reusables/gated-features/display-names.md
+++ b/data/reusables/gated-features/display-names.md
@@ -1 +1 @@
-Allowing members to see comment authors' profile names is available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Allowing members to see comment authors' profile names is available with {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_server %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/ghas-ghec.md b/data/reusables/gated-features/ghas-ghec.md
index e9f0e7a5b97c..c45d1db3899b 100644
--- a/data/reusables/gated-features/ghas-ghec.md
+++ b/data/reusables/gated-features/ghas-ghec.md
@@ -1,3 +1,3 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}{% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
+{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}{% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
 
 {% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/ghas.md b/data/reusables/gated-features/ghas.md
index ba7bfcdecfe0..e63c672e2820 100644
--- a/data/reusables/gated-features/ghas.md
+++ b/data/reusables/gated-features/ghas.md
@@ -1,3 +1,3 @@
-{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+{% data variables.product.prodname_GH_advanced_security %} is available for enterprise accounts on {% data variables.product.prodname_ghe_cloud %}{% ifversion ghae %}, {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} Some features of {% data variables.product.prodname_GH_advanced_security %} are also available for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% ifversion ghas-for-azure-devops %}<br><br>{% endif %}
 {% data reusables.advanced-security.ghas-for-azdo-link %}
diff --git a/data/reusables/gated-features/more-info-org-products.md b/data/reusables/gated-features/more-info-org-products.md
index e2511a366cba..7913778d01c9 100644
--- a/data/reusables/gated-features/more-info-org-products.md
+++ b/data/reusables/gated-features/more-info-org-products.md
@@ -1 +1 @@
-{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/more-info.md b/data/reusables/gated-features/more-info.md
index e2511a366cba..7913778d01c9 100644
--- a/data/reusables/gated-features/more-info.md
+++ b/data/reusables/gated-features/more-info.md
@@ -1 +1 @@
-{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+{% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/repository-insights.md b/data/reusables/gated-features/repository-insights.md
index 27738ec059ba..63c7e20d3c7b 100644
--- a/data/reusables/gated-features/repository-insights.md
+++ b/data/reusables/gated-features/repository-insights.md
@@ -1 +1 @@
-This repository insights graph is available in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} For more information, see "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/about-repository-graphs)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."{% endif %}
+This repository insights graph is available in public repositories with {% data variables.product.prodname_free_user %} and {% data variables.product.prodname_free_team %} for organizations, and in public and private repositories with {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %},{% ifversion ghae %} {% data variables.product.prodname_ghe_managed %},{% endif %} and {% data variables.product.prodname_ghe_server %}.{% ifversion fpt or ghec %} For more information, see "[AUTOTITLE](/repositories/viewing-activity-and-data-for-your-repository/about-repository-graphs)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."{% endif %}
diff --git a/data/reusables/gated-features/restrict-email-domain.md b/data/reusables/gated-features/restrict-email-domain.md
index 5a90da2c4b86..eed0377b4282 100644
--- a/data/reusables/gated-features/restrict-email-domain.md
+++ b/data/reusables/gated-features/restrict-email-domain.md
@@ -1 +1 @@
-Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Restriction of email notifications to approved or verified domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/gated-features/security-overview.md b/data/reusables/gated-features/security-overview.md
index 07cc9ebec06a..8c41ebd3677a 100644
--- a/data/reusables/gated-features/security-overview.md
+++ b/data/reusables/gated-features/security-overview.md
@@ -1,5 +1,5 @@
 {% ifversion fpt %}
-Security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% elsif security-overview-displayed-alerts %}
 All enterprises and their organizations have a security overview. If you use {% data variables.product.prodname_GH_advanced_security %} features{% ifversion ghae %}, which are free during the beta release,{% elsif ghec %}, which are free for public repositories,{% endif %} you will see additional information. {% data reusables.advanced-security.more-info-ghas %}
 {% elsif ghes < 3.7 %}
diff --git a/data/reusables/gated-features/verify-and-approve-domain.md b/data/reusables/gated-features/verify-and-approve-domain.md
index 7ec67642e4ba..2c0ee90114a9 100644
--- a/data/reusables/gated-features/verify-and-approve-domain.md
+++ b/data/reusables/gated-features/verify-and-approve-domain.md
@@ -1 +1 @@
-Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+Verification and approval of domains is available with {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/organizations/outside-collaborators-use-seats.md b/data/reusables/organizations/outside-collaborators-use-seats.md
index 8b4ca9076430..eb0dcd94e91c 100644
--- a/data/reusables/organizations/outside-collaborators-use-seats.md
+++ b/data/reusables/organizations/outside-collaborators-use-seats.md
@@ -1 +1 @@
-{% ifversion fpt %} Unless you are on a free plan, adding{% else %}Adding{% endif %} an outside collaborator to a private{% ifversion ghec %} or internal{% endif %} repository will use one of your paid licenses. For more information, see "{% ifversion fpt or ghec %}[About per-user pricing](/billing/managing-billing-for-your-github-account/about-per-user-pricing){% elsif ghes or ghae %}[About billing for your enterprise](/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise){% endif %}."
+{% ifversion fpt %} Unless you are on a free plan, adding{% else %}Adding{% endif %} an outside collaborator to a private{% ifversion ghec %} or internal{% endif %} repository will use one of your paid licenses. For more information, see "{% ifversion fpt or ghec %}[About per-user pricing](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing){% elsif ghes or ghae %}[About billing for your enterprise](/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise){% endif %}."
diff --git a/data/reusables/package_registry/packages-billing.md b/data/reusables/package_registry/packages-billing.md
index 07e599fb33dd..73c06a68cee8 100644
--- a/data/reusables/package_registry/packages-billing.md
+++ b/data/reusables/package_registry/packages-billing.md
@@ -1 +1 @@
-{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.location.product_location %} receives a certain amount of free storage and data transfer, depending on the product used with the account. Any usage beyond the included amounts is controlled by spending limits.
+{% data variables.product.prodname_registry %} usage is free for public packages. For private packages, each account on {% data variables.location.product_location %} receives a certain amount of free storage and data transfer, depending on the account's plan. Any usage beyond the included amounts is controlled by spending limits.
diff --git a/data/reusables/products/which-product-to-use.md b/data/reusables/products/which-product-to-use.md
index 7cedf99ee355..93c20c9cc37e 100644
--- a/data/reusables/products/which-product-to-use.md
+++ b/data/reusables/products/which-product-to-use.md
@@ -1 +1 @@
-If you're not sure whether {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, or both are best for your organization, contact {% data variables.contact.contact_enterprise_sales %}. If your organization has 11 or fewer developers, consider {% data variables.product.prodname_team %}; organizations with 12 or more developers typically benefit the most from {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+If you're not sure whether {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, or both are best for your organization, contact {% data variables.contact.contact_enterprise_sales %}. If your organization has 11 or fewer developers, consider {% data variables.product.prodname_team %}; organizations with 12 or more developers typically benefit the most from {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
diff --git a/data/reusables/repositories/you-can-fork.md b/data/reusables/repositories/you-can-fork.md
index 72cac7e8aa2f..5499201803ca 100644
--- a/data/reusables/repositories/you-can-fork.md
+++ b/data/reusables/repositories/you-can-fork.md
@@ -5,5 +5,5 @@ If the policies for your enterprise permit forking private and internal reposito
 You can fork a private or internal repository to your personal account or to an organization on {% data variables.location.product_location %} where you have permission to create repositories, provided that the settings for the repository and your enterprise policies allow forking. Generally, you can fork any public repository to your personal account or to an organization where you have permission to create repositories{% ifversion ghec %}, unless you're a member of an {% data variables.enterprise.prodname_emu_enterprise %}{% endif %}.
 
 {% elsif fpt %}
-You can fork any public repository to your personal account, or to an organization where you have permission to create repositories. If you have access to a private repository and the owner permits forking, you can fork the repository to your personal account, or to an organization on {% data variables.product.prodname_team %} where you have permission to create repositories. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}. For more information about {% data variables.product.prodname_team %} and {% data variables.product.prodname_free_team %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."
+You can fork any public repository to your personal account, or to an organization where you have permission to create repositories. If you have access to a private repository and the owner permits forking, you can fork the repository to your personal account, or to an organization on {% data variables.product.prodname_team %} where you have permission to create repositories. You cannot fork a private repository to an organization using {% data variables.product.prodname_free_team %}. For more information about {% data variables.product.prodname_team %} and {% data variables.product.prodname_free_team %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 {% endif %}
diff --git a/tests/fixtures/versionless-redirects.txt b/tests/fixtures/versionless-redirects.txt
index f17c108a8c23..1e362a82235b 100644
--- a/tests/fixtures/versionless-redirects.txt
+++ b/tests/fixtures/versionless-redirects.txt
@@ -23,7 +23,7 @@
 - /early-access/github/articles/verifying-your-enterprise-accounts-domain
 - /github/setting-up-and-managing-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise-account
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
+/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
 - /billing/managing-billing-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise-account/viewing-the-subscription-and-usage-for-your-enterprise-account
@@ -117,7 +117,7 @@
 - /graphql/guides/managing-enterprise-accounts
 - /v4/guides/managing-enterprise-accounts
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-github-enterprise
 
@@ -258,7 +258,7 @@
 - /github/setting-up-and-managing-your-enterprise-account/managing-organizations-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/managing-organizations-in-your-enterprise-account
 
-/enterprise-cloud@latest/billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
+/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/managing-invoices-for-your-enterprise
 - /billing/managing-billing-for-your-github-account/managing-invoices-for-your-enterprise
 
 /enterprise-cloud@latest/organizations/managing-peoples-access-to-your-organization-with-roles/managing-custom-repository-roles-for-an-organization