Merge pull request #4792 from MicrosoftDocs/main

8/9/2023 AM Publish

docs/govern/resource-consistency/naming.md

@@ -45,7 +45,7 @@ Use the following resources to understand the components of a good naming conven
 - Read [Define your naming convention](../../ready/azure-best-practices/resource-naming.md) to learn about the important components of a well-defined naming convention, and see some example names for common Azure resource types.
 - Read or reference [Abbreviation examples for Azure resources](../../ready/azure-best-practices/resource-abbreviations.md) to help determine the abbreviations you'll use for the Azure resources you're using.
 - Read or reference [Naming rules and restrictions for Azure resources](/azure/azure-resource-manager/management/resource-name-rules) to understand the rules and restrictions on names for the Azure resources you're using.
-- Install and configure the [Azure Naming Tool](https://github.com/microsoft/CloudAdoptionFramework/tree/master/ready/AzNamingTool) with the organizational standards you determined above. Use the tool to generate names for resources.
+- Install and configure the [Azure Naming Tool](https://github.com/mspnp/AzureNamingTool) with the organizational standards you determined above. Use the tool to generate names for resources.
 
 ## Enforce
 

docs/ready/azure-best-practices/naming-and-tagging.md

@@ -25,7 +25,7 @@ Define your naming and tagging strategy as early as possible. Use the following
 > [!NOTE]
 > Every business has its own organizational and management requirements. These recommendations help start a discussion with your cloud adoption teams. As the discussion proceeds, use the tools below to document the naming and tagging decisions you make when aligning these recommendations to your specific business needs.
 >
-> Download the [Azure Naming Tool](https://github.com/microsoft/CloudAdoptionFramework/tree/master/ready/AzNamingTool) to create an organizational naming reference and name generator.
+> Download the [Azure Naming Tool](https://github.com/mspnp/AzureNamingTool) to create an organizational naming reference and name generator.
 > 
 > Download the [naming and tagging conventions tracking template](https://raw.githubusercontent.com/microsoft/CloudAdoptionFramework/master/ready/naming-and-tagging-conventions-tracking-template.xlsx).
 

docs/ready/azure-best-practices/resource-abbreviations.md

@@ -15,7 +15,7 @@ ms.custom: internal, readiness, fasttrack-edit
 
 This page gives you abbreviation examples for many of the resources in Azure. The following table has *abbreviations* mapped to *resource* and *resource provider namespace*.
 
-**Azure Naming Tool:** You can use the Azure Naming Tool to standardize and automate your naming process. For more information, see [Azure Naming Tool Overview](https://github.com/microsoft/CloudAdoptionFramework/tree/master/ready/AzNamingTool).
+**Azure Naming Tool:** You can use the Azure Naming Tool to standardize and automate your naming process. For more information, see [Azure Naming Tool Overview](https://github.com/mspnp/AzureNamingTool).
 
 <!-- cSpell:ignoreRegExp `[a-z]+-?` -->
 <!-- cspell:ignoreRegExp [_\*][a-z]+[\\-] -->
@@ -233,6 +233,7 @@ This page gives you abbreviation examples for many of the resources in Azure. Th
 |--|--|--|
 | Azure Bastion | `Microsoft.Network/bastionHosts` | `bas` |
 | Key vault | `Microsoft.KeyVault/vaults` | `kv` |
+| Key Vault Managed HSM | `Microsoft.KeyVault/managedHSMs` | `kvmhsm` |
 | Managed identity | `Microsoft.ManagedIdentity/userAssignedIdentities` | `id` |
 | VPN Gateway| `Microsoft.Network/vpnGateways` | `vpng`|
 | VPN connection | `Microsoft.Network/vpnGateways/vpnConnections` | `vcn` |

docs/ready/azure-best-practices/resource-naming.md

@@ -93,7 +93,7 @@ The following section provides example names for common Azure resource types in
 > Choose an approach that's suitable for your organization. The padding shown here illustrates the importance of using a consistent approach to inventory numbering, rather than showing which approach is superior. Before choosing a numbering scheme, with or without padding, evaluate what will affect long-term operations more: CMDB and asset management solutions or code-based inventory management. Then, consistently follow the padding option that best fits your operational needs.
 
 The following section provides some example names for common Azure resource types in an enterprise cloud deployment. For more examples, see the 
-[Azure Naming Tool](https://github.com/microsoft/CloudAdoptionFramework/tree/master/ready/AzNamingTool) and the [Naming and tagging tracking template](https://raw.githubusercontent.com/microsoft/CloudAdoptionFramework/master/ready/naming-and-tagging-conventions-tracking-template.xlsx).
+[Azure Naming Tool](https://github.com/mspnp/AzureNamingTool) and the [Naming and tagging tracking template](https://raw.githubusercontent.com/microsoft/CloudAdoptionFramework/master/ready/naming-and-tagging-conventions-tracking-template.xlsx).
 
 > [!NOTE]
 > The following examples are intended to provide visualization of a naming convention, but actual conventions vary by organization.  

docs/resources/tools-templates.md

@@ -37,7 +37,7 @@ The Cloud Adoption Framework has tools, templates, and assessments that can help
 | Resource | Description |
 |----------|-------------|
 | [Readiness checklist](https://raw.githubusercontent.com/Microsoft/CloudAdoptionFramework/master/ready/readiness-checklist.docx) | Use this checklist to prepare your environment for adoption. It includes preparations for your first migration landing zone, personalizing the blueprint, and expanding it. |
-| [Azure naming tool](https://github.com/microsoft/CloudAdoptionFramework/tree/master/ready/AzNamingTool) | Develop your comprehensive Azure naming convention in minutes. |
+| [Azure naming tool](https://github.com/mspnp/AzureNamingTool) | Develop your comprehensive Azure naming convention in minutes. |
 | [Naming and tagging conventions tracking template](https://raw.githubusercontent.com/microsoft/CloudAdoptionFramework/master/ready/naming-and-tagging-conventions-tracking-template.xlsx) | Document your decisions about naming and tagging standards to ensure consistency across resources and reduce onboarding time. |
 | [CAF Foundation blueprint](https://github.com/Microsoft/CloudAdoptionFramework/tree/master/ready/migration-landing-zone-governance) | Deploy your lightweight implementation of an initial governance foundation - providing practical experience with governance tools in Azure. |
 | [CAF Migration landing zone blueprint](https://github.com/Microsoft/CloudAdoptionFramework/tree/master/ready/migration-landing-zone) | Provision - and prepare to host your workloads that are migrated from on-premises environments into Azure. Read more on how to [deploy a migration landing zone](../ready/landing-zone/migrate-landing-zone.md) blueprint. |