docs: align toolkit terminology with current FinOps Framework naming

docs-mslearn/conduct-iteration.md

@@ -3,7 +3,7 @@ title: Tutorial - Conduct an iteration
 description: This tutorial helps you learn how to take an iterative approach to FinOps adoption.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: tutorial
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -46,7 +46,7 @@ Use the following information as a guide to select the right FinOps capabilities
    1. Reporting and analytics
    2. Forecasting
    3. Budgeting
-   4. Workload optimization
+   4. Usage optimization
    5. Anomaly management
 2. If you're building a new FinOps team or interested in driving awareness and adoption of FinOps, start with:
    1. FinOps practice operations
@@ -69,11 +69,11 @@ Use the following information as a guide to select the right FinOps capabilities
    4. Reporting and analytics
 6. If your team has a solid understanding of the basics and wants to focus on deeper optimization through advanced automation, consider:
    1. Architecting for the cloud
-   2. Workload optimization
+   2. Usage optimization
    3. Rate optimization
    4. Licensing and SaaS
    5. Cloud sustainability
-   6. Policy and governance
+   6. Governance, policy, and risk
 7. If your team has a solid understanding of the basics and needs to map cloud investments back to business value, consider:
    1. Unit economics
    2. Allocation

docs-mslearn/framework/capabilities.md

@@ -3,7 +3,7 @@ title: FinOps capabilities
 description: Learn about what the fundamental building blocks of the FinOps Framework that enable you to maximize business value through the cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: conceptual
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -44,7 +44,7 @@ The **Quantify business value** domain is focused on identifying and breaking do
 The **Optimize usage and cost** domain is focused on designing and optimizing solutions for efficiency to ensure you get the most out of your cloud investments.
 
 - [Architecting for the cloud](./optimize/architecting.md)
-- [Workload optimization](./optimize/workloads.md)
+- [Usage optimization](./optimize/workloads.md)
 - [Rate optimization](./optimize/rates.md)
 - [Licensing and SaaS](./optimize/licensing.md)
 - [Cloud sustainability](./optimize/sustainability.md)
@@ -58,7 +58,7 @@ The **Manage the FinOps practice** domain is focused on establishing a clear and
 - [FinOps education and enablement](./manage/education.md)
 - [FinOps practice operations](./manage/operations.md)
 - [Onboarding workloads](./manage/onboarding.md)
-- [Policy and governance](./manage/governance.md)
+- [Governance, policy, and risk](./manage/governance.md)
 - [Invoicing and chargeback](./manage/invoicing-chargeback.md)
 - [FinOps assessment](./manage/assessment.md)
 - [FinOps tools and services](./manage/tools-services.md)

docs-mslearn/framework/finops-framework.md

@@ -3,7 +3,7 @@ title: FinOps Framework overview
 description: 'Learn about what the FinOps Framework is and how you can use it to accelerate your cost management and optimization goals.'
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -133,7 +133,7 @@ The FinOps Framework includes capabilities that cover everything you need to per
 - Optimize usage and cost
 
   - [Architecting for the cloud](./optimize/architecting.md)
-  - [Workload optimization](./optimize/workloads.md)
+  - [Usage optimization](./optimize/workloads.md)
   - [Rate optimization](./optimize/rates.md)
   - [Licensing and SaaS](./optimize/licensing.md)
   - [Cloud sustainability](./optimize/sustainability.md)
@@ -143,7 +143,7 @@ The FinOps Framework includes capabilities that cover everything you need to per
   - [FinOps education and enablement](./manage/education.md)
   - [FinOps practice operations](./manage/operations.md)
   - [Onboarding workloads](./manage/onboarding.md)
-  - [Policy and governance](./manage/governance.md)
+  - [Governance, policy, and risk](./manage/governance.md)
   - [Invoicing and chargeback](./manage/invoicing-chargeback.md)
   - [FinOps assessment](./manage/assessment.md)
   - [FinOps tools and services](./manage/tools-services.md)

docs-mslearn/framework/manage/governance.md

@@ -1,31 +1,31 @@
 ---
-title: Policy and governance
-description: This article helps you understand the policy and governance capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
+title: Governance, policy, and risk
+description: This article helps you understand the governance, policy, and risk capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
 ms.reviewer: kedelaro
-# customer intent: As a FinOps practitioner, I want to understand the policy and governance capability so that I can implement it in the Microsoft Cloud.
+# customer intent: As a FinOps practitioner, I want to understand the governance, policy, and risk capability so that I can implement it in the Microsoft Cloud.
 ---
 
-# Policy and governance
+# Governance, policy, and risk
 
-This article helps you understand the policy and governance capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
+This article helps you understand the governance, policy, and risk capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 
 <br>
 
 ## Definition
 
-**Policy and governance refers to the process of defining, implementing, and monitoring a framework of rules that guide an organization's FinOps efforts.**
+**Governance, policy, and risk refers to the process of defining, implementing, and monitoring a framework of rules that guide an organization's FinOps efforts.**
 
 Define your governance goals and success metrics. Review and document how existing policies are updated to account for FinOps efforts. Review with all stakeholders to get buy-in and endorsement.
 
 Establish a rollout plan that starts with audit rules and slowly (and safely) expands coverage to drive compliance without negatively impacting engineering efforts.
 
-Implementing a policy and governance strategy enables organizations to sustainably implement FinOps at scale. Policy and governance can act as a multiplier to FinOps efforts by building them natively into day-to-day operations.
+Implementing a governance, policy, and risk strategy enables organizations to sustainably implement FinOps at scale. Governance, policy, and risk can act as a multiplier to FinOps efforts by building them natively into day-to-day operations.
 
 <br>
 
@@ -59,14 +59,14 @@ At this point, you have a basic set of policies in place that are being managed
   - Map governance efforts to FinOps efficiencies that can be mapped back to more business value with less effort.
 - Expand coverage of more scenarios.
   - Consider evaluating ways to quantify the impact of each rule in cost and/or business value.
-- Integrate policy and governance into every conversation to establish a plan for how you want to automate the tracking and application of new policies.
+- Integrate governance, policy, and risk into every conversation to establish a plan for how you want to automate the tracking and application of new policies.
 - Consider advanced governance scenarios outside of Azure Policy. Build monitoring solutions using systems like [Power Automate](/power-automate/getting-started) or [Logic Apps](/azure/logic-apps/logic-apps-overview).
 
 <br>
 
 ## Learn more at the FinOps Foundation
 
-This capability is a part of the FinOps Framework by the FinOps Foundation, a non-profit organization dedicated to advancing cloud cost management and optimization. For more information about FinOps, including useful playbooks, training and certification programs, and more, see the [Policy and governance capability](https://www.finops.org/framework/capabilities/policy-governance/) article in the FinOps Framework documentation.
+This capability is a part of the FinOps Framework by the FinOps Foundation, a non-profit organization dedicated to advancing cloud cost management and optimization. For more information about FinOps, including useful playbooks, training and certification programs, and more, see the [Governance, policy, and risk capability](https://www.finops.org/framework/capabilities/governance-policy-risk/) article in the FinOps Framework documentation.
 
 You can also find related videos on the FinOps Foundation YouTube channel:
 
@@ -97,7 +97,7 @@ If you're looking for something specific, vote for an existing or create a new i
 Related FinOps capabilities:
 
 - [FinOps practice operations](./operations.md)
-- [Workload optimization](../optimize/workloads.md)
+- [Usage optimization](../optimize/workloads.md)
 
 Related products:
 

docs-mslearn/framework/manage/manage-finops.md

@@ -3,7 +3,7 @@ title: Manage the FinOps practice
 description: Learn about the FinOps capabilities that help you establish your FinOps practice and drive organizational accountability.
 author: flanakin
 ms.author: micflan
-ms.date: 05/19/2026
+ms.date: 06/21/2026
 ms.topic: conceptual
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -20,7 +20,7 @@ This domain is focused on establishing a clear and consistent vision of FinOps a
 
 ## FinOps education and enablement
 
-FinOps education and enablement involve refers to the process of providing training, resources, and support to help individuals and teams within an organization adopt FinOps practices. This capability ensures that stakeholders across the organization have the resources they need to:
+FinOps education and enablement refers to the process of providing training, resources, and support to help individuals and teams within an organization adopt FinOps practices. This capability ensures that stakeholders across the organization have the resources they need to:
 
 - Understand FinOps
 - Understand how it can help them achieve their goals
@@ -56,15 +56,15 @@ To learn more, see [Onboarding workloads](./onboarding.md).
 
 <br>
 
-## Policy and governance
+## Governance, policy, and risk
 
-Policy and governance refer to the process of defining, implementing, and monitoring a framework of rules that guide an organization's FinOps efforts. With this capability, you identify and implement policies to support organizational goals by promoting or limiting the use of:
+Governance, policy, and risk refers to the process of defining, implementing, and monitoring a framework of rules that guide an organization's FinOps efforts. With this capability, you identify and implement policies to support organizational goals by promoting or limiting the use of:
 
 - Specific SKUs
 - Resource configurations
 - Other practices that might affect cost, usage, and carbon growth
 
-To learn more, see [Policy and governance](./governance.md).
+To learn more, see [Governance, policy, and risk](./governance.md).
 
 <br>
 

docs-mslearn/framework/manage/onboarding.md

@@ -3,7 +3,7 @@ title: Onboarding workloads
 description: This article helps you understand the onboarding workloads capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 05/19/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -104,6 +104,6 @@ If you're looking for something specific, vote for an existing or create a new i
 Related FinOps capabilities:
 
 - [Forecasting](../quantify/forecasting.md)
-- [Policy and governance](./governance.md)
+- [Governance, policy, and risk](./governance.md)
 
 <br>

docs-mslearn/framework/optimize/architecting.md

@@ -3,7 +3,7 @@ title: Architecting for cloud
 description: This article helps you understand the architecting for cloud capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -96,7 +96,7 @@ If you're looking for something specific, vote for an existing or create a new i
 
 Related FinOps capabilities:
 
-- [Workload optimization](./workloads.md)
+- [Usage optimization](./workloads.md)
 - [Rate optimization](./rates.md)
 
 Other resources:

docs-mslearn/framework/optimize/licensing.md

@@ -3,7 +3,7 @@ title: Licensing and SaaS
 description: This article helps you understand the licensing and SaaS capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -82,7 +82,7 @@ If you're looking for something specific, vote for an existing or create a new i
 Related FinOps capabilities:
 
 - [Reporting and analytics](../understand/reporting.md)
-- [Policy and governance](../manage/governance.md)
+- [Governance, policy, and risk](../manage/governance.md)
 
 Related solutions:
 

docs-mslearn/framework/optimize/optimize-cloud-usage-cost.md

@@ -3,7 +3,7 @@ title: Optimize usage and cost
 description: Learn about the FinOps capabilities that help you identify and implement the right mix of pricing models, services, and resources needed to meet business demands.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: conceptual
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -28,11 +28,11 @@ To learn more, see [Architecting for the cloud](./architecting.md).
 
 <br>
 
-## Workload optimization
+## Usage optimization
 
-Onboarding workloads refers to the process of bringing new and existing applications into the cloud based on their financial and technical feasibility. With this capability, you analyze cost, usage, and carbon emissions for cloud workloads to identify opportunities to maximize efficiency. This capability usually starts with recommendations and expands into more nuanced optimization efforts based on detailed resource utilization analysis. This capability can be time and effort intensive as each cloud service has its different optimization opportunities.
+Usage optimization focuses on analyzing cost, usage, and carbon emissions across cloud workloads to identify opportunities to maximize efficiency. This capability usually starts with recommendations and expands into more nuanced optimization efforts based on detailed resource utilization analysis. This capability can be time and effort intensive because each cloud service has different optimization opportunities.
 
-To learn more, see [Workload optimization](./workloads.md).
+To learn more, see [Usage optimization](./workloads.md).
 
 <br>
 

docs-mslearn/framework/optimize/rates.md

@@ -3,7 +3,7 @@ title: Rate optimization
 description: This article helps you understand the rate optimization capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -106,7 +106,7 @@ If you're looking for something specific, vote for an existing or create a new i
 Related FinOps capabilities:
 
 - [Data analysis and showback](../understand/reporting.md)
-- [Policy and governance](../manage/governance.md)
+- [Governance, policy, and risk](../manage/governance.md)
 
 Related products:
 

docs-mslearn/framework/optimize/sustainability.md

@@ -3,7 +3,7 @@ title: Cloud sustainability
 description: This article helps you understand the cloud sustainability capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
@@ -75,7 +75,7 @@ If you're looking for something specific, vote for an existing or create a new i
 
 Related FinOps capabilities:
 
-- [Workload optimization](./workloads.md)
+- [Usage optimization](./workloads.md)
 - [Rate optimization](./rates.md)
 - [Unit economics](../quantify/unit-economics.md)
 

docs-mslearn/framework/optimize/workloads.md

@@ -1,31 +1,31 @@
 ---
-title: Workload optimization
-description: This article helps you understand the Workload optimization capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
+title: Usage optimization
+description: This article helps you understand the Usage optimization capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 author: flanakin
 ms.author: micflan
-ms.date: 04/01/2026
+ms.date: 06/21/2026
 ms.topic: concept-article
 ms.service: finops
 ms.subservice: finops-learning-resources
 ms.reviewer: kedelaro
-# customer intent: As a FinOps practitioner, I want to understand the workload optimization capability so that I can implement it in the Microsoft Cloud.
+# customer intent: As a FinOps practitioner, I want to understand the usage optimization capability so that I can implement it in the Microsoft Cloud.
 ---
 
-# Workload optimization
+# Usage optimization
 
-This article helps you understand the Workload optimization capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
+This article helps you understand the Usage optimization capability within the FinOps Framework and how to implement that in the Microsoft Cloud.
 
 <br>
 
 ## Definition
 
-**Workload optimization refers to the process of ensuring cloud services are utilized and tuned to maximize business value and minimize wasteful usage and spending.**
+**Usage optimization refers to the process of ensuring cloud services are utilized and tuned to maximize business value and minimize wasteful usage and spending.**
 
 Review how services get used and ensure each is maximizing return on investment. Evaluate and implement best practices and recommendations.
 
 Every cost should have direct or indirect traceability back to business value. Eliminate fully "optimized" resources that aren't contributing to business value.
 
-Review your resource usage patterns and determine if they can be scaled down or even shutdown (to stop billing) during off-peak hours. To reduce costs, consider cheaper alternatives. Avoid unnecessary usage and costs that don't contribute to the mission, which in turn increases return on investment and profitability.
+Review your resource usage patterns and determine if they can be scaled down or even shut down (to stop billing) during off-peak hours. To reduce costs, consider cheaper alternatives. Avoid unnecessary usage and costs that don't contribute to the mission, which in turn increases return on investment and profitability.
 
 <br>
 
@@ -90,7 +90,7 @@ At this point, you implemented all the basic cost optimization recommendations a
 
 ## Learn more at the FinOps Foundation
 
-This capability is a part of the FinOps Framework by the FinOps Foundation, a non-profit organization dedicated to advancing cloud cost management and optimization. For more information about FinOps, including useful playbooks, training and certification programs, and more, see the [Workload optimization capability](https://www.finops.org/framework/capabilities/workload-optimization/) article in the FinOps Framework documentation.
+This capability is a part of the FinOps Framework by the FinOps Foundation, a non-profit organization dedicated to advancing cloud cost management and optimization. For more information about FinOps, including useful playbooks, training and certification programs, and more, see the [Usage optimization capability](https://www.finops.org/framework/capabilities/usage-optimization/) article in the FinOps Framework documentation.
 
 You can also find related videos on the FinOps Foundation YouTube channel:
 
@@ -121,7 +121,7 @@ If you're looking for something specific, vote for an existing or create a new i
 Related FinOps capabilities:
 
 - [Rate optimization](./rates.md)
-- [Policy and governance](../manage/governance.md)
+- [Governance, policy, and risk](../manage/governance.md)
 
 Related products: