diff --git a/src/service_name.json b/src/service_name.json
index f31bb96beb6..9b8bde7ccc2 100644
--- a/src/service_name.json
+++ b/src/service_name.json
@@ -1,33 +1,33 @@
 [
   {
     "Command": "az account",
-    "AzureServiceName": "Azure CLI",
+    "AzureServiceName": "Account",
     "URL": ""
   },
   {
     "Command": "az acr",
-    "AzureServiceName": "Azure Container Registry",
-    "URL": "https://docs.microsoft.com/azure/container-registry/"
+    "AzureServiceName": "Container Registry",
+    "URL": "https://learn.microsoft.com/azure/container-registry"
   },
   {
     "Command": "az ad",
     "AzureServiceName": "Azure Active Directory",
-    "URL": "https://docs.microsoft.com/en-us/azure/active-directory/"
+    "URL": "https://learn.microsoft.com/azure/active-directory"
   },
   {
     "Command": "az ai-examples",
-    "AzureServiceName": "Microsoft AI",
-    "URL": "https://docs.microsoft.com/archive/msdn-magazine/2017/connect/artificial-intelligence-getting-started-with-microsoft-ai"
+    "AzureServiceName": "AI Examples",
+    "URL": "https://learn.microsoft.com/ai/"
   },
   {
     "Command": "az aks",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/azure/aks/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/aks"
   },
   {
     "Command": "az alerts-management",
-    "AzureServiceName": "Azure Alerts Management",
-    "URL": "https://learn.microsoft.com/en-us/azure/azure-monitor/alerts/alerts-overview"
+    "AzureServiceName": "Alerts Management",
+    "URL": "https://learn.microsoft.com/azure/azure-monitor/alerts/alerts-overview"
   },
   {
     "Command": "az alias",
@@ -36,203 +36,203 @@
   },
   {
     "Command": "az appservice",
-    "AzureServiceName": "Azure App Service",
-    "URL": "https://docs.microsoft.com/azure/app-service/"
+    "AzureServiceName": "App Services",
+    "URL": "https://learn.microsoft.com/azure/app-service"
   },
   {
     "Command": "az attestation",
-    "AzureServiceName": "Azure Attestation",
-    "URL": "https://docs.microsoft.com/azure/attestation/overview"
+    "AzureServiceName": "Attestation",
+    "URL": "https://learn.microsoft.com/azure/attestation/overview"
   },
   {
     "Command": "az automation",
-    "AzureServiceName": "Azure Automation",
-    "URL": "https://docs.microsoft.com/azure/automation/automation-intro"
+    "AzureServiceName": "Automation",
+    "URL": "https://learn.microsoft.com/azure/automation/automation-intro"
   },
   {
     "Command": "az batch",
-    "AzureServiceName": "Azure Batch",
-    "URL": "https://docs.microsoft.com/azure/batch/"
+    "AzureServiceName": "Batch",
+    "URL": "https://learn.microsoft.com/azure/batch"
   },
   {
     "Command": "az baremetalinstance",
-    "AzureServiceName": "Microsoft Windows",
-    "URL": "https://docs.microsoft.com/windows-hardware/test/assessments/"
+    "AzureServiceName": "BareMetal Infrastructure",
+    "URL": "https://learn.microsoft.com/en-us/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview"
   },
   {
     "Command": "az blockchain",
-    "AzureServiceName": "Azure Blockchain",
-    "URL": "https://docs.microsoft.com/azure/blockchain/"
+    "AzureServiceName": "Blockchain",
+    "URL": "https://learn.microsoft.com/azure/blockchain"
   },
   {
     "Command": "az blueprint",
-    "AzureServiceName": "Azure Blueprint",
-    "URL": "https://docs.microsoft.com/azure/governance/blueprints/"
+    "AzureServiceName": "Blueprint",
+    "URL": "https://learn.microsoft.com/azure/governance/blueprints"
   },
   {
     "Command": "az cli-translator",
     "AzureServiceName": "Azure CLI",
-    "URL": ""
+    "URL": "https://learn.microsoft.com/cli/azure/cli-translator"
   },
   {
     "Command": "az cloud-service",
-    "AzureServiceName": "Azure Cloud Services (extended support)",
-    "URL": "https://docs.microsoft.com/azure/cloud-services-extended-support/"
+    "AzureServiceName": "Cloud Services (extended support)",
+    "URL": "https://learn.microsoft.com/azure/cloud-services-extended-support"
   },
   {
     "Command": "az communication",
-    "AzureServiceName": "Azure Communication Service",
-    "URL": "https://docs.microsoft.com/azure/communication-services/"
+    "AzureServiceName": "Communication Services",
+    "URL": "https://learn.microsoft.com/azure/communication-services"
   },
   {
     "Command": "az confcom",
-    "AzureServiceName": "Microsoft Confidential Computing",
-    "URL": "https://docs.microsoft.com/en-us/azure/confcom/"
+    "AzureServiceName": "Confidential Computing",
+    "URL": "https://learn.microsoft.com/azure/confcom"
   },
   {
     "Command": "az confidentialledger",
-    "AzureServiceName": "Microsoft Confidential Ledger",
-    "URL": "https://docs.microsoft.com/en-us/azure/confidential-ledger/"
+    "AzureServiceName": "Confidential Ledger",
+    "URL": "https://learn.microsoft.com/azure/confidential-ledger"
   },
   {
     "Command": "az confluent",
-    "AzureServiceName": "Microsoft Partner Services",
-    "URL": ""
+    "AzureServiceName": "Confluent",
+    "URL": "https://learn.microsoft.com/azure/partner-solutions/apache-kafka-confluent-cloud/overview"
   },
   {
     "Command": "az connectedk8s",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/azure/aks/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/aks"
   },
   {
     "Command": "az connectedmachine",
-    "AzureServiceName": "Azure Arc",
-    "URL": "https://docs.microsoft.com/azure/azure-arc/servers/overview"
+    "AzureServiceName": "Arc",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/servers/overview"
   },
   {
     "Command": "az connection",
     "AzureServiceName": "Service Connector",
-    "URL": "https://learn.microsoft.com/azure/service-connector/"
+    "URL": "https://learn.microsoft.com/azure/service-connector"
   },
   {
     "Command": "az containerapp",
-    "AzureServiceName": "Azure Container Apps",
-    "URL": "https://docs.microsoft.com/en-us/azure/container-apps/"
+    "AzureServiceName": "Container Apps",
+    "URL": "https://learn.microsoft.com/azure/container-apps"
   },
   {
     "Command": "az costmanagement",
-    "AzureServiceName": "Azure Cost Management + Billing",
-    "URL": "https://docs.microsoft.com/azure/cost-management-billing/"
+    "AzureServiceName": "Cost Management",
+    "URL": "https://learn.microsoft.com/azure/cost-management-billing"
   },
   {
     "Command": "az csvmware",
-    "AzureServiceName": "Azure VMware Solution",
-    "URL": "https://docs.microsoft.com/azure/vmware-cloudsimple/cloudsimple-vmware-solutions-overview"
+    "AzureServiceName": "CloudSimple on Azure",
+    "URL": "https://learn.microsoft.com/azure/vmware-cloudsimple/cloudsimple-vmware-solutions-overview"
   },
   {
     "Command": "az custom-providers",
-    "AzureServiceName": "Azure Custom Providers",
-    "URL": "https://docs.microsoft.com/azure/azure-resource-manager/custom-providers/overview"
+    "AzureServiceName": "Custom Providers",
+    "URL": "https://learn.microsoft.com/azure/azure-resource-manager/custom-providers/overview"
   },
   {
     "Command": "az databox",
-    "AzureServiceName": "Azure Databox",
-    "URL": "https://docs.microsoft.com/azure/databox/"
+    "AzureServiceName": "Databox",
+    "URL": "https://learn.microsoft.com/azure/databox"
   },
   {
     "Command": "az datadog",
-    "AzureServiceName": "Microsoft Partner Services",
-    "URL": "unknown"
+    "AzureServiceName": "Datadog",
+    "URL": "https://docs.datadoghq.com/integrations/azure/?tab=azurecli"
   },
   {
     "Command": "az databricks",
-    "AzureServiceName": "Azure Databricks",
-    "URL": "https://docs.microsoft.com/azure/databricks/"
+    "AzureServiceName": "Databricks",
+    "URL": "https://learn.microsoft.com/azure/databricks"
   },
   {
     "Command": "az datafactory",
-    "AzureServiceName": "Azure Data Factory",
-    "URL": "https://docs.microsoft.com/azure/data-factory/"
+    "AzureServiceName": "Data Factory",
+    "URL": "https://learn.microsoft.com/azure/data-factory"
   },
   {
     "Command": "az datamigration",
-    "AzureServiceName": "Azure Database Migration Service",
-    "URL": "https://docs.microsoft.com/en-us/azure/dms/"
+    "AzureServiceName": "Database Migration Services",
+    "URL": "https://learn.microsoft.com/azure/dms"
   },
   {
     "Command": "az datashare",
-    "AzureServiceName": "Azure Data Share",
-    "URL": "https://docs.microsoft.com/azure/data-share/"
+    "AzureServiceName": "Data Share",
+    "URL": "https://learn.microsoft.com/azure/data-share"
   },
   {
     "Command": "az disk-pool",
-    "AzureServiceName": "Azure Disk Pool Service",
-    "URL": "https://docs.microsoft.com/azure/disk-pool/"
+    "AzureServiceName": "VMware",
+    "URL": "https://azure.microsoft.com/en-us/updates/new-capabilities-introduced-for-disk-pool-public-preview-for-azure-vmware-solution/"
   },
   {
     "Command": "az dedicated-hsm",
-    "AzureServiceName": "Azure Dedicated HSM",
-    "URL": "https://docs.microsoft.com/azure/dedicated-hsm/"
+    "AzureServiceName": "Dedicated HSM",
+    "URL": "https://learn.microsoft.com/azure/dedicated-hsm"
   },
   {
     "Command": "az desktopvirtualization",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/azure/virtual-desktop/overview"
+    "AzureServiceName": "Virtual Desktop",
+    "URL": "https://learn.microsoft.com/azure/virtual-desktop/overview"
   },
   {
     "Command": "az devcenter",
     "AzureServiceName": "Microsoft Dev Box and Azure Deployment Environments",
-    "URL": "https://learn.microsoft.com/azure/dev-box/"
+    "URL": "https://learn.microsoft.com/azure/dev-box"
   },
   {
     "Command": "az dms",
-    "AzureServiceName": "Azure Database Migration Service",
-    "URL": "https://docs.microsoft.com/en-us/azure/dms/"
+    "AzureServiceName": "Database Migration Services",
+    "URL": "https://learn.microsoft.com/azure/dms"
   },
   {
     "Command": "az dnc",
-    "AzureServiceName": "Delegated Network Controller",
-    "URL": ""
+    "AzureServiceName": "Networking",
+    "URL": "DNC = Delegated Network Controller"
   },
   {
     "Command": "az dns-resolver",
-    "AzureServiceName": "Azure DNS Resolver",
-    "URL": ""
+    "AzureServiceName": "DNS Private Resolver",
+    "URL": "https://learn.microsoft.com/azure/dns/dns-overview"
   },
   {
     "Command": "az dt",
-    "AzureServiceName": "Azure Digital Twins",
-    "URL": "https://azure.microsoft.com/en-us/services/digital-twins/"
+    "AzureServiceName": "Digital Twins",
+    "URL": "https://azure.microsoft.com/services/digital-twins"
   },
   {
     "Command": "az edgeorder",
-    "AzureServiceName": "Azure Edge Order",
-    "URL": "https://review.docs.microsoft.com/en-us/azure/azure-edge-hardware-center"
+    "AzureServiceName": "Edge Order",
+    "URL": "https://review.learn.microsoft.com/azure/azure-edge-hardware-center"
   },
   {
     "Command": "az elastic",
-    "AzureServiceName": "Azure Elastic",
-    "URL": "https://docs.microsoft.com/en-us/azure/partner-solutions/elastic/overview"
+    "AzureServiceName": "Elastic",
+    "URL": "https://learn.microsoft.com/azure/partner-solutions/elastic/overview"
   },
   {
     "Command": "az fleet",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/azure/aks/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/aks"
   },
   {
     "Command": "az fluid-relay",
-    "AzureServiceName": "Azure Fluid Relay",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-fluid-relay/overview/overview"
+    "AzureServiceName": "Fluid Relay",
+    "URL": "https://learn.microsoft.com/azure/azure-fluid-relay/overview/overview"
   },
   {
     "Command": "az footprint",
-    "AzureServiceName": "Azure Monitor",
+    "AzureServiceName": "Monitor",
     "URL": ""
   },
   {
     "Command": "az functionapp",
-    "AzureServiceName": "Azure Functions",
-    "URL": "https://docs.microsoft.com/azure/azure-functions/"
+    "AzureServiceName": "Functions",
+    "URL": "https://learn.microsoft.com/azure/azure-functions"
   },
   {
     "Command": "az fzf",
@@ -241,48 +241,48 @@
   },
   {
     "Command": "az graph",
-    "AzureServiceName": "Azure Resource Graph",
-    "URL": "https://docs.microsoft.com/azure/governance/resource-graph/overview"
+    "AzureServiceName": "Resource Graph",
+    "URL": "https://learn.microsoft.com/azure/governance/resource-graph/overview"
   },
   {
     "Command": "az guestconfig",
-    "AzureServiceName": "Azure Policy",
-    "URL": "https://docs.microsoft.com/azure/governance/policy/concepts/guest-configuration"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/en-us/azure/virtual-machines/extensions/guest-configuration"
   },
   {
     "Command": "az hack",
-    "AzureServiceName": "Azure Lab Services",
-    "URL": "https://docs.microsoft.com/azure/lab-services/hackathon-labs"
+    "AzureServiceName": "Lab Services",
+    "URL": "https://learn.microsoft.com/azure/lab-services/hackathon-labs"
   },
   {
     "Command": "az hanainstance",
-    "AzureServiceName": "SAP HANA on Azure",
-    "URL": "https://docs.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
+    "AzureServiceName": "SAP on Azure",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
   },
   {
     "Command": "az healthbot",
-    "AzureServiceName": "Azure Bot Service",
-    "URL": "https://docs.microsoft.com/azure/bot-service/"
+    "AzureServiceName": "Bot Service",
+    "URL": "https://learn.microsoft.com/azure/bot-service"
   },
   {
     "Command": "az healthcareapis",
-    "AzureServiceName": "Azure API for FHIR",
-    "URL": "https://docs.microsoft.com/azure/healthcare-apis/overview"
+    "AzureServiceName": "API for FHIR",
+    "URL": "https://learn.microsoft.com/azure/healthcare-apis/overview"
   },
   {
     "Command": "az hpc-cache",
-    "AzureServiceName": "Azure HPC Cache",
-    "URL": "https://docs.microsoft.com/azure/hpc-cache/hpc-cache-overview"
+    "AzureServiceName": "HPC Cache",
+    "URL": "https://learn.microsoft.com/azure/hpc-cache/hpc-cache-overview"
   },
   {
     "Command": "az image",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/azure/virtual-machines/windows/capture-image-resource"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/capture-image-resource"
   },
   {
     "Command": "az import-export",
-    "AzureServiceName": "Azure Storage",
-    "URL": "https://docs.microsoft.com/azure/storage/common/storage-import-export-service?toc=/azure/storage/blobs/toc.json"
+    "AzureServiceName": "Storage",
+    "URL": "https://learn.microsoft.com/azure/storage/common/storage-import-export-service"
   },
   {
     "Command": "az init",
@@ -296,118 +296,108 @@
   },
   {
     "Command": "az internet-analyzer",
-    "AzureServiceName": "Azure Network",
-    "URL": "https://docs.microsoft.com/azure/internet-analyzer/"
+    "AzureServiceName": "Networking",
+    "URL": "https://learn.microsoft.com/azure/internet-analyzer"
   },
   {
     "Command": "az iot",
-    "AzureServiceName": "Azure IoT",
-    "URL": "https://azure.microsoft.com/en-us/overview/iot/"
+    "AzureServiceName": "IoT",
+    "URL": "https://azure.microsoft.com/overview/iot"
   },
   {
     "Command": "az k8s-configuration",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/kubernetes"
   },
   {
     "Command": "az k8sconfiguration",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/kubernetes"
   },
   {
     "Command": "az k8s-extension",
-    "AzureServiceName": "Azure Kubernetes Service (AKS)",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/kubernetes"
   },
   {
     "Command": "az keyvault",
-    "AzureServiceName": "Azure Key Vault",
-    "URL": "https://docs.microsoft.com/azure/key-vault/"
+    "AzureServiceName": "Key Vault",
+    "URL": "https://learn.microsoft.com/azure/key-vault"
   },
   {
     "Command": "az load",
-    "AzureServiceName": "Azure Load Testing",
-    "URL": "https://learn.microsoft.com/en-us/azure/load-testing/"
+    "AzureServiceName": "Load Testing",
+    "URL": "https://learn.microsoft.com/azure/load-testing"
   },
   {
     "Command": "az logic",
-    "AzureServiceName": "Azure Logic Apps",
-    "URL": "https://docs.microsoft.com/azure/logic-apps/"
+    "AzureServiceName": "Logic Apps",
+    "URL": "https://learn.microsoft.com/azure/logic-apps"
   },
   {
     "Command": "az logz",
-    "AzureServiceName": "Azure Logz.io",
-    "URL": "https://docs.microsoft.com/en-us/azure/partner-solutions/logzio/overview"
+    "AzureServiceName": "Logz.io",
+    "URL": "https://learn.microsoft.com/azure/partner-solutions/logzio/overview"
   },
   {
     "Command": "az maintenance",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/azure/virtual-machines/maintenance-control-cli"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/maintenance-control-cli"
   },
   {
     "Command": "az cosmosdb",
-    "AzureServiceName": "Azure Cosmos DB",
-    "URL": "https://docs.microsoft.com/azure/cosmos-db/"
+    "AzureServiceName": "Database for Cosmos DB",
+    "URL": "https://learn.microsoft.com/azure/cosmos-db"
   },
   {
     "Command": "az managed-cassandra",
-    "AzureServiceName": "Azure Cosmos DB",
-    "URL": "https://docs.microsoft.com/azure/cosmos-db/"
+    "AzureServiceName": "Database for Cosmos DB",
+    "URL": "https://learn.microsoft.com/azure/cosmos-db"
   },
   {
     "Command": "az managementpartner",
-    "AzureServiceName": "Microsoft Partner Network",
-    "URL": "https://docs.microsoft.com/partner-center/"
+    "AzureServiceName": "Partner Network",
+    "URL": "https://learn.microsoft.com/partner-center"
   },
   {
     "Command": "az mesh",
-    "AzureServiceName": "Azure Service Fabric Mesh",
-    "URL": "https://docs.microsoft.com/azure/service-fabric-mesh/"
+    "AzureServiceName": "Service Fabric Mesh",
+    "URL": "https://learn.microsoft.com/azure/service-fabric-mesh"
   },
   {
     "Command": "az ml",
-    "AzureServiceName": "Azure Machine Learning",
-    "URL": "https://docs.microsoft.com/azure/machine-learning/"
+    "AzureServiceName": "Machine Learning",
+    "URL": "https://learn.microsoft.com/azure/machine-learning"
   },
   {
     "Command": "az monitor",
-    "AzureServiceName": "Azure Monitor",
-    "URL": "https://docs.microsoft.com/azure/azure-monitor/"
+    "AzureServiceName": "Monitor",
+    "URL": "https://learn.microsoft.com/azure/azure-monitor"
   },
   {
     "Command": "az mysql",
-    "AzureServiceName": "Azure Database for MySQL",
-    "URL": "https://docs.microsoft.com/azure/mysql/"
+    "AzureServiceName": "Database for MySQL",
+    "URL": "https://learn.microsoft.com/azure/mysql"
   },
   {
     "Command": "az network",
-    "AzureServiceName": "Azure Network",
-    "URL": "https://azure.microsoft.com/en-us/product-categories/networking/"
-  },
-  {
-    "Command": "az network bastion",
-    "AzureServiceName": "Azure Network Bastion",
-    "URL": "https://learn.microsoft.com/en-us/azure/bastion/"
+    "AzureServiceName": "Networking",
+    "URL": "https://azure.microsoft.com/product-categories/networking"
   },
   {
     "Command": "az networkcloud",
-    "AzureServiceName": "Azure Operator Nexus",
+    "AzureServiceName": "Networking",
     "URL": "https://learn.microsoft.com/en-us/azure/operator-nexus/"
   },
   {
     "Command": "az networkfabric",
-    "AzureServiceName": "Managed Network Fabric",
+    "AzureServiceName": "Networking",
     "URL": "https://learn.microsoft.com/en-us/azure/operator-nexus/"
   },
   {
     "Command": "az network-function",
-    "AzureServiceName": "Azure Network Function",
-    "URL": "https://docs.microsoft.com/en-us/rest/api/hybridnetwork/network-functions"
-  },
-  {
-    "Command": "az network alb",
-    "AzureServiceName": "Application Gateway for Containers",
-    "URL": ""
+    "AzureServiceName": "Networking",
+    "URL": "https://learn.microsoft.com/rest/api/hybridnetwork/network-functions"
   },
   {
     "Command": "az next",
@@ -416,63 +406,63 @@
   },
   {
     "Command": "az notification-hub",
-    "AzureServiceName": "Azure Notification Hubs",
-    "URL": "https://docs.microsoft.com/azure/notification-hubs/"
+    "AzureServiceName": "Notification Hubs",
+    "URL": "https://learn.microsoft.com/azure/notification-hubs"
   },
   {
     "Command": "az offazure",
-    "AzureServiceName": "Azure Migrate",
-    "URL": "https://docs.microsoft.com/azure/migrate/"
+    "AzureServiceName": "Migrate",
+    "URL": "https://learn.microsoft.com/azure/migrate"
   },
   {
     "Command": "az peering",
-    "AzureServiceName": "Azure Network",
-    "URL": "https://docs.microsoft.com/azure/virtual-network/virtual-network-peering-overview"
+    "AzureServiceName": "Networking",
+    "URL": "https://learn.microsoft.com/azure/virtual-network/virtual-network-peering-overview"
   },
   {
     "Command": "az portal",
-    "AzureServiceName": "Azure Portal",
-    "URL": "https://docs.microsoft.com/azure/azure-portal/azure-portal-dashboards"
+    "AzureServiceName": "Portal Dashboards",
+    "URL": "https://learn.microsoft.com/azure/azure-portal/azure-portal-dashboards"
   },
   {
     "Command": "az postgres",
-    "AzureServiceName": "Azure Database for PostgreSQL",
-    "URL": "https://docs.microsoft.com/azure/postgresql/"
+    "AzureServiceName": "Database for PostgreSQL",
+    "URL": "https://learn.microsoft.com/azure/postgresql"
   },
   {
     "Command": "az powerbi",
     "AzureServiceName": "Power BI",
-    "URL": "https://docs.microsoft.com/power-bi/developer/"
+    "URL": "https://learn.microsoft.com/power-bi/developer"
   },
   {
     "Command": "az providerhub",
-    "AzureServiceName": "Azure Providers",
+    "AzureServiceName": "Provider Hub",
     "URL": ""
   },
   {
     "Command": "az quantum",
-    "AzureServiceName": "Azure Quantum",
-    "URL": "https://docs.microsoft.com/azure/quantum/"
+    "AzureServiceName": "Quantum",
+    "URL": "https://learn.microsoft.com/azure/quantum"
   },
   {
     "Command": "az redisenterprise",
-    "AzureServiceName": "Azure Cache for Redis",
-    "URL": "https://docs.microsoft.com/azure/azure-cache-for-redis/"
+    "AzureServiceName": "Cache for Redis",
+    "URL": "https://learn.microsoft.com/azure/azure-cache-for-redis"
   },
   {
     "Command": "az remote-rendering-account",
-    "AzureServiceName": "Azure Remote Rendering",
-    "URL": ""
+    "AzureServiceName": "Mixed Reality",
+    "URL": "https://azure.microsoft.com/products/remote-rendering"
   },
   {
     "Command": "az resource-mover",
-    "AzureServiceName": "Azure Resource Mover",
-    "URL": "https://azure.microsoft.com/en-us/services/resource-mover/"
+    "AzureServiceName": "Resource Mover",
+    "URL": "https://azure.microsoft.com/services/resource-mover"
   },
   {
     "Command": "az sapmonitor",
-    "AzureServiceName": "SAP HANA on Azure",
-    "URL": "https://docs.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
+    "AzureServiceName": "SAP on Azure",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/workloads/sap/hana-overview-architecture"
   },
   {
     "Command": "az scenario",
@@ -481,228 +471,218 @@
   },
   {
     "Command": "az sentinel",
-    "AzureServiceName": "Microsoft Sentinel",
-    "URL": "https://docs.microsoft.com/azure/sentinel/overview"
+    "AzureServiceName": "Sentinel",
+    "URL": "https://learn.microsoft.com/azure/sentinel/overview"
   },
   {
     "Command": "az sig",
-    "AzureServiceName": "Azure Shared Image Gallery",
-    "URL": "https://docs.microsoft.com/en-us/azure/virtual-machines/shared-image-galleries"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/shared-image-galleries"
   },
   {
     "Command": "az spatial-anchors-account",
-    "AzureServiceName": "Azure Spatial Anchors",
-    "URL": "https://docs.microsoft.com/windows/mixed-reality/mixed-reality"
+    "AzureServiceName": "Mixed Reality",
+    "URL": "https://learn.microsoft.com/azure/spatial-anchors"
   },
   {
     "Command": "az spring-cloud",
-    "AzureServiceName": "Azure Spring Cloud",
-    "URL": "https://docs.microsoft.com/azure/spring-cloud/"
+    "AzureServiceName": "Spring Apps",
+    "URL": "https://learn.microsoft.com/azure/spring-apps"
   },
   {
     "Command": "az spring",
-    "AzureServiceName": "Azure Spring Apps",
-    "URL": "https://docs.microsoft.com/azure/spring-cloud/"
+    "AzureServiceName": "Spring Apps",
+    "URL": "https://learn.microsoft.com/azure/spring-apps"
   },
   {
     "Command": "az sql",
-    "AzureServiceName": "Azure SQL",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-sql/"
+    "AzureServiceName": "Database for SQL Server",
+    "URL": "https://learn.microsoft.com/azure/azure-sql"
   },
   {
     "Command": "az ssh",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/azure/virtual-machines/linux/mac-create-ssh-keys/"
+    "AzureServiceName": "SSH",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines/linux/mac-create-ssh-keys"
   },
   {
     "Command": "az stack-hci",
-    "AzureServiceName": "Azure Stack",
-    "URL": "https://docs.microsoft.com/azure-stack/hci/"
+    "AzureServiceName": "Stack HCI",
+    "URL": "https://learn.microsoft.com/azure-stack/hci"
   },
   {
     "Command": "az staticwebapp",
-    "AzureServiceName": "Azure Static Web Apps",
-    "URL": "https://azure.microsoft.com/en-us/services/app-service/static/"
+    "AzureServiceName": "App Services",
+    "URL": "https://learn.microsoft.com/azure/static-web-apps/"
   },
   {
     "Command": "az storage",
-    "AzureServiceName": "Azure Storage",
-    "URL": "https://docs.microsoft.com/azure/storage/files/storage-sync-files-planning"
+    "AzureServiceName": "Storage",
+    "URL": "https://learn.microsoft.com/azure/storage/files/storage-sync-files-planning"
   },
   {
     "Command": "az storagesync",
-    "AzureServiceName": "Azure File Sync",
-    "URL": "https://docs.microsoft.com/azure/storage/files/storage-sync-files-planning"
+    "AzureServiceName": "Storage",
+    "URL": "https://learn.microsoft.com/azure/storage/files/storage-sync-files-planning"
   },
   {
     "Command": "az stream-analytics",
-    "AzureServiceName": "Azure Stream Analytics",
-    "URL": "https://docs.microsoft.com/azure/stream-analytics/"
+    "AzureServiceName": "Stream Analytics",
+    "URL": "https://learn.microsoft.com/azure/stream-analytics"
   },
   {
     "Command": "az support",
     "AzureServiceName": "Azure Support",
-    "URL": "https://azure.microsoft.com/support/options/"
+    "URL": "https://azure.microsoft.com/support/options"
   },
   {
     "Command": "az tsi",
-    "AzureServiceName": "Azure Time Series Insights",
-    "URL": "https://docs.microsoft.com/azure/time-series-insights/"
+    "AzureServiceName": "Time Series Insights",
+    "URL": "https://learn.microsoft.com/azure/time-series-insights"
   },
   {
     "Command": "az vmware",
-    "AzureServiceName": "Azure VMware Solution",
-    "URL": "https://docs.microsoft.com/azure/azure-vmware/"
+    "AzureServiceName": "VMware",
+    "URL": "https://learn.microsoft.com/azure/azure-vmware"
   },
   {
     "Command": "az kusto",
-    "AzureServiceName": "Azure Data Explorer",
-    "URL": "https://docs.microsoft.com/azure/data-explorer/"
+    "AzureServiceName": "Data Explorer",
+    "URL": "https://learn.microsoft.com/azure/data-explorer"
   },
   {
     "Command": "az webapp",
-    "AzureServiceName": "Azure App Service",
-    "URL": ""
+    "AzureServiceName": "App Services",
+    "URL": "https://learn.microsoft.com/azure/app-service"
   },
   {
     "Command": "az webpubsub",
-    "AzureServiceName": "Azure Web PubSub",
-    "URL": ""
+    "AzureServiceName": "Web PubSub",
+    "URL": "https://learn.microsoft.com/azure/azure-web-pubsub"
   },
   {
     "Command": "az connectedvmware",
-    "AzureServiceName": "Azure Arc for PrivateClouds",
-    "URL": "https://github.com/Azure/azure-arc-enabled-vmware-vsphere-preview/blob/main/docs/overview.md"
+    "AzureServiceName": "Arc-enabled VMware vSphere",
+    "URL": "https://learn.microsoft.com/en-us/azure/azure-arc/vmware-vsphere/overview"
   },
   {
     "Command": "az scvmm",
-    "AzureServiceName": "Azure Arc for PrivateClouds",
+    "AzureServiceName": "Arc-enabled SCVMM",
     "URL": "https://aka.ms/azure-arc/scvmm/docs"
   },
   {
     "Command": "az dataprotection",
-    "AzureServiceName": "Azure Data Protection",
-    "URL": ""
+    "AzureServiceName": "Backup",
+    "URL": "https://learn.microsoft.com/azure/backup/multi-user-authorization"
   },
   {
     "Command": "az serial-console",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/en-us/troubleshoot/azure/virtual-machines/serial-console-overview"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/troubleshoot/azure/virtual-machines/serial-console-overview"
   },
   {
     "Command": "az arcdata",
-    "AzureServiceName": "Azure Arc",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/data/"
+    "AzureServiceName": "Arc",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/data"
   },
   {
     "Command": "az arcappliance",
-    "AzureServiceName": "Azure Arc",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/"
+    "AzureServiceName": "Arc",
+    "URL": "https://learn.microsoft.com/azure/azure-arc"
   },
   {
     "Command": "az customlocation",
-    "AzureServiceName": "Azure Arc",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-arc/kubernetes/conceptual-custom-locations"
+    "AzureServiceName": "Arc",
+    "URL": "https://learn.microsoft.com/azure/azure-arc/kubernetes/conceptual-custom-locations"
   },
   {
     "Command": "az vm-repair",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/en-us/cli/azure/vm/repair?view=azure-cli-latest"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/cli/azure/vm/repair"
   },
   {
     "Command": "az vm",
-    "AzureServiceName": "Azure Virtual Machines",
-    "URL": "https://docs.microsoft.com/en-us/azure/virtual-machines/"
-  },
-  {
-    "Command": "az webapp",
-    "AzureServiceName": "Azure Web Apps",
-    "URL": "https://docs.microsoft.com/en-us/azure/app-service/"
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/azure/virtual-machines"
   },
   {
     "Command": "az pipelines",
-    "AzureServiceName": "Azure Pipelines",
-    "URL": "https://docs.microsoft.com/en-us/azure/devops/pipelines/"
+    "AzureServiceName": "DevOps",
+    "URL": "https://learn.microsoft.com/azure/devops/pipelines"
   },
   {
     "Command": "az repos",
-    "AzureServiceName": "Azure Repos",
-    "URL": "https://docs.microsoft.com/en-us/azure/devops/repos/"
+    "AzureServiceName": "DevOps",
+    "URL": "https://learn.microsoft.com/azure/devops/repos"
   },
   {
     "Command": "az boards",
-    "AzureServiceName": "Azure Boards",
-    "URL": "https://docs.microsoft.com/en-us/azure/devops/boards/"
+    "AzureServiceName": "DevOps",
+    "URL": "https://learn.microsoft.com/azure/devops/boards"
   },
   {
     "Command": "az artifacts",
-    "AzureServiceName": "Azure Artifacts",
-    "URL": "https://docs.microsoft.com/en-us/azure/devops/artifacts/"
+    "AzureServiceName": "DevOps",
+    "URL": "https://learn.microsoft.com/azure/devops/artifacts"
   },
   {
     "Command": "az devops",
-    "AzureServiceName": "Azure DevOps",
-    "URL": "https://docs.microsoft.com/en-us/azure/devops/"
+    "AzureServiceName": "DevOps",
+    "URL": "https://learn.microsoft.com/azure/devops"
   },
   {
     "Command": "az purview",
-    "AzureServiceName": "Azure Purview",
-    "URL": "https://docs.microsoft.com/en-us/azure/purview/"
-  },
-  {
-    "Command": "az functionapp",
-    "AzureServiceName": "Azure Functions",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-functions/"
+    "AzureServiceName": "Purview",
+    "URL": "https://learn.microsoft.com/azure/purview"
   },
   {
     "Command": "az azurestackhci",
-    "AzureServiceName": "Azure Stack HCI",
-    "URL": "https://docs.microsoft.com/en-us/cli/azure/azurestackhci?view=azure-cli-latest"
+    "AzureServiceName": "Stack HCI",
+    "URL": "https://learn.microsoft.com/azure-stack/hci"
   },
   {
     "Command": "az grafana",
-    "AzureServiceName": "Azure Managed Grafana",
+    "AzureServiceName": "Managed Grafana",
     "URL": ""
   },
   {
     "Command": "az quota",
-    "AzureServiceName": "Reserved VM Instances",
-    "URL": "https://docs.microsoft.com/en-us/rest/api/reserved-vm-instances/quotaapi"
+    "AzureServiceName": "Quota",
+    "URL": "https://learn.microsoft.com/rest/api/reserved-vm-instances/quotaapi"
   },
   {
     "Command": "az change-analysis",
-    "AzureServiceName": "Change Analysis",
-    "URL": "https://docs.microsoft.com/en-us/azure/azure-monitor/change/change-analysis"
+    "AzureServiceName": "Monitor",
+    "URL": "https://learn.microsoft.com/azure/azure-monitor/change/change-analysis"
   },
   {
     "Command": "az orbital",
-    "AzureServiceName": "Azure Orbital",
-    "URL": "https://docs.microsoft.com/en-us/azure/orbital/"
+    "AzureServiceName": "Orbital",
+    "URL": "https://learn.microsoft.com/azure/orbital"
   },
   {
     "Command": "az nginx",
-    "AzureServiceName": "Nginx for Azure",
-    "URL": "https://docs.microsoft.com/en-us/azure/partner-solutions/nginx/nginx-overview"
+    "AzureServiceName": "Nginx",
+    "URL": "https://learn.microsoft.com/azure/partner-solutions/nginx/nginx-overview"
   },
   {
     "Command": "az elastic-san",
-    "AzureServiceName": "Azure Elastic SAN",
-    "URL": ""
+    "AzureServiceName": "Storage",
+    "URL": "https://learn.microsoft.com/azure/storage/elastic-san"
   },
   {
     "Command": "az reservations",
-    "AzureServiceName": "Azure Reservations",
-    "URL": "https://docs.microsoft.com/en-us/azure/cost-management-billing/reservations"
+    "AzureServiceName": "Cost Management",
+    "URL": "https://learn.microsoft.com/azure/cost-management-billing/reservations"
   },
   {
     "Command": "az hybridaks",
-    "AzureServiceName": "Hybrid Container Service",
-    "URL": "https://learn.microsoft.com/en-us/azure-stack/aks-hci/aks-hybrid-preview-overview"
+    "AzureServiceName": "Kubernetes Service (AKS)",
+    "URL": "https://learn.microsoft.com/azure-stack/aks-hci/aks-hybrid-preview-overview"
   },
   {
     "Command": "az dynatrace",
     "AzureServiceName": "Dynatrace Observability",
-    "URL": "https://docs.microsoft.com/en-us/azure/partner-solutions/dynatrace/"
+    "URL": "https://learn.microsoft.com/azure/partner-solutions/dynatrace"
   },
   {
     "Command": "az adp",
@@ -716,47 +696,42 @@
   },
   {
     "Command": "az billing-benefits",
-    "AzureServiceName": "Azure Billing Benefits",
-    "URL": "https://learn.microsoft.com/en-us/azure/cost-management-billing/savings-plan/"
+    "AzureServiceName": "Cost Management",
+    "URL": "https://learn.microsoft.com/azure/cost-management-billing/savings-plan"
   },
   {
     "Command": "az mobile-network",
-    "AzureServiceName": "Mobile Network",
-    "URL": "https://learn.microsoft.com/en-us/azure/private-5g-core/"
+    "AzureServiceName": "Mobile Networking",
+    "URL": "https://learn.microsoft.com/azure/private-5g-core"
   },
   {
     "Command": "az automanage",
-    "AzureServiceName": "Azure Automanage",
-    "URL": "https://learn.microsoft.com/en-us/azure/automanage/"
-  },
-  {
-    "Command": "az voice-service",
-    "AzureServiceName": "Azure VoiceServices",
-    "URL": ""
+    "AzureServiceName": "Virtual Machines",
+    "URL": "https://learn.microsoft.com/azure/automanage"
   },
   {
     "Command": "az storage-mover",
-    "AzureServiceName": "Storage Mover",
-    "URL": "https://learn.microsoft.com/en-us/azure/storage-mover/"
+    "AzureServiceName": "Storage",
+    "URL": "https://learn.microsoft.com/azure/storage-mover"
   },
   {
-    "Command": "az confidentialledger managedccfs",
-    "AzureServiceName": "Azure Managed Confidential Consortium Framework",
-    "URL": "https://docs.microsoft.com/en-us/azure/confidential-ledger/"
+    "Command": "az confidentialledger",
+    "AzureServiceName": "Confidential Consortium Framework (CCF)",
+    "URL": "https://learn.microsoft.com/azure/confidential-ledger"
   },
   {
     "Command": "az workloads",
-    "AzureServiceName": "Azure Workloads",
-    "URL": "https://learn.microsoft.com/en-us/azure/sap/workloads/get-started"
+    "AzureServiceName": "SAP on Azure",
+    "URL": "https://learn.microsoft.com/azure/sap/workloads/get-started"
   },
   {
     "Command": "az self-help",
-    "AzureServiceName": "Azure Help",
-    "URL": "https://learn.microsoft.com/en-us/rest/api/help/"
+    "AzureServiceName": "Azure CLI",
+    "URL": "https://learn.microsoft.com/rest/api/help"
   },
   {
     "Command": "az qumulo",
     "AzureServiceName": "Qumulo",
     "URL": "https://learn.microsoft.com/en-us/azure/partner-solutions/qumulo/qumulo-overview"
   }
-]
\ No newline at end of file
+]