diff --git a/tools/CreateMappings_rules.json b/tools/CreateMappings_rules.json
index b35600e9d3dd..2e44ea9c4ef0 100644
--- a/tools/CreateMappings_rules.json
+++ b/tools/CreateMappings_rules.json
@@ -1,875 +1,879 @@
 [
-    {
-        "alias":  "Container Apps",
-        "module":  "App"
-    },
-    {
-        "alias":  "Dashboard",
-        "module":  "Dashboard",
-        "group":  "Grafana"
-    },
-    {
-        "alias":  "Confidential Ledger",
-        "module":  "ConfidentialLedger"
-    },
-    {
-        "regex":  "ApiManagement",
-        "alias":  "API Management"
-    },
-    {
-        "module":  "MachineLearning",
-        "group":  "ML Studio (Classic)",
-        "alias":  "ML Studio (Classic)"
-    },
-    {
-        "module":  "MachineLearningServices",
-        "alias":  "Machine Learning"
-    },
-    {
-        "regex":  "ImageBuilder",
-        "alias":  "Image Builder"
-    },
-    {
-        "regex":  "VMware",
-        "alias":  "VMware"
-    },
-    {
-        "module":  "GuestConfiguration",
-        "alias":  "Guest Configuration"
-    },
-    {
-        "regex":  "Snapshot",
-        "group":  "Virtual Machines",
-        "alias":  "VM Snapshots"
-    },
-    {
-        "module":  "Orbital",
-        "alias":  "Orbital"
-    },
-    {
-        "regex":  "FluidRelay",
-        "alias":  "Fluid Relay"
-    },
-    {
-        "regex":  "Image",
-        "group":  "Virtual Machines",
-        "alias":  "VM Images"
-    },
-    {
-        "regex":  "Vmss",
-        "group":  "Virtual Machines",
-        "alias":  "VM Scale Sets"
-    },
-    {
-        "regex":  "Vhd",
-        "group":  "Virtual Machines",
-        "alias":  "VM VHDs"
-    },
-    {
-        "regex":  "Disk",
-        "group":  "Virtual Machines",
-        "alias":  "VM Disks"
-    },
-    {
-        "regex":  "ContainerService",
-        "group":  "Virtual Machines",
-        "alias":  "Container Service"
-    },
-    {
-        "regex":  "VM.*Extension",
-        "group":  "Virtual Machines",
-        "alias":  "VM Extensions"
-    },
-    {
-        "regex":  "Compute",
-        "group":  "Virtual Machines",
-        "alias":  "Virtual Machines"
-    },
-    {
-        "regex":  "VM",
-        "group":  "Virtual Machines",
-        "alias":  "Virtual Machines"
-    },
-    {
-        "regex":  "ApplicationGateway",
-        "group":  "Network",
-        "alias":  "Application Gateway"
-    },
-    {
-        "regex":  "ExpressRoute",
-        "group":  "Network",
-        "alias":  "ExpressRoute"
-    },
-    {
-        "regex":  "LoadBalancer",
-        "group":  "Network",
-        "alias":  "Load Balancer"
-    },
-    {
-        "regex":  "VirtualNetwork",
-        "group":  "Network",
-        "alias":  "Virtual Network"
-    },
-    {
-        "regex":  "Vpn",
-        "group":  "Network",
-        "alias":  "VPN"
-    },
-    {
-        "regex":  "Route",
-        "group":  "Network",
-        "alias":  "Route"
-    },
-    {
-        "group":  "DnsResolver",
-        "alias":  "DnsResolver"
-    },
-    {
-        "regex":  "Dns",
-        "group":  "Network",
-        "alias":  "DNS"
-    },
-    {
-        "regex":  "NetworkWatcher",
-        "group":  "Network",
-        "alias":  "Network Watcher"
-    },
-    {
-        "regex":  "Network",
-        "group":  "Network",
-        "alias":  "Networking"
-    },
-    {
-        "module":  "Nginx",
-        "alias":  "Nginx"
-    },
-    {
-        "regex":  "FrontDoor",
-        "alias":  "Front Door"
-    },
-    {
-        "regex":  "AppService",
-        "group":  "App Service",
-        "alias":  "App Service"
-    },
-    {
-        "regex":  "Websites",
-        "group":  "App Service",
-        "alias":  "App Service"
-    },
-    {
-        "regex":  "WebApp",
-        "group":  "App Service",
-        "alias":  "App Service"
-    },
-    {
-        "regex":  "ACS",
-        "alias":  "Azure Stack Storage"
-    },
-    {
-        "regex":  "AzureStackAdmin",
-        "alias":  "Azure Stack Admin"
-    },
-    {
-        "regex":  "AzureStackStorage",
-        "alias":  "Azure Stack Storage"
-    },
-    {
-        "regex":  "DataLakeAnalytics",
-        "group":  "Data Lake",
-        "alias":  "Data Lake Analytics"
-    },
-    {
-        "regex":  "DataLakeStore",
-        "group":  "Data Lake",
-        "alias":  "Data Lake Store"
-    },
-    {
-        "regex":  "DataLake",
-        "group":  "Data Lake",
-        "alias":  "Data Lake"
-    },
-    {
-        "regex":  "Dtl",
-        "group":  "DevTest Labs",
-        "alias":  "DevTest Labs"
-    },
-    {
-        "regex":  "DevTestLabs",
-        "group":  "DevTest Labs",
-        "alias":  "DevTest Labs"
-    },
-    {
-        "regex":  "DataFactory",
-        "group":  "Data Factories",
-        "alias":  "Data Factories"
-    },
-    {
-        "regex":  "DataFactories",
-        "group":  "Data Factories",
-        "alias":  "Data Factories"
-    },
-    {
-        "regex":  "StorageSync",
-        "alias":  "StorageSync"
-    },
-    {
-        "regex":  "Storage",
-        "alias":  "Storage"
-    },
-    {
-        "regex":  "Synapse",
-        "alias":  "Synapse Analytics"
-    },
-    {
-        "regex":  "Relay",
-        "alias":  "Relay"
-    },
-    {
-        "regex":  "ServiceBus",
-        "alias":  "Service Bus"
-    },
-    {
-        "regex":  "ContainerRegistry",
-        "alias":  "Container Registry"
-    },
-    {
-        "regex":  "ServiceFabric",
-        "alias":  "Service Fabric"
-    },
-    {
-        "regex":  "KeyVault",
-        "alias":  "Key Vault"
-    },
-    {
-        "regex":  "IotCentral",
-        "alias":  "IotCentral"
-    },
-    {
-        "regex":  "IotHub",
-        "alias":  "IotHub"
-    },
-    {
-        "regex":  "DeviceProvisioningServices",
-        "alias":  "DPS"
-    },
-    {
-        "regex":  "Batch",
-        "alias":  "Batch"
-    },
-    {
-        "regex":  "AnalysisServices",
-        "alias":  "Analysis Services"
-    },
-    {
-        "regex":  "Automation",
-        "alias":  "Automation"
-    },
-    {
-        "regex":  "RecoveryServices",
-        "alias":  "Recovery Services"
-    },
-    {
-        "regex":  "Backup",
-        "alias":  "Backup"
-    },
-    {
-        "regex":  "Cdn",
-        "alias":  "CDN"
-    },
-    {
-        "regex":  "CognitiveService",
-        "alias":  "Cognitive Services"
-    },
-    {
-        "regex":  "AvailabilitySet",
-        "alias":  "Availability Sets"
-    },
-    {
-        "regex":  "EventHub",
-        "alias":  "Event Hub"
-    },
-    {
-        "regex":  "HDInsight",
-        "alias":  "HDInsight"
-    },
-    {
-        "regex":  "HPCCache",
-        "alias":  "HPCCache"
-    },
-    {
-        "regex":  "LogicApp",
-        "alias":  "Logic Apps"
-    },
-    {
-        "regex":  "NotificationHubs",
-        "alias":  "Notification Hubs"
-    },
-    {
-        "regex":  "OperationalInsights",
-        "alias":  "Operational Insights"
-    },
-    {
-        "regex":  "PolicyInsights",
-        "alias":  "Policy Insights"
-    },
-    {
-        "regex":  "PowerBIEmbedded",
-        "group":  "Power BI",
-        "alias":  "Power BI Embedded Capacity"
-    },
-    {
-        "regex":  "PowerBIWorkspace",
-        "group":  "Power BI",
-        "alias":  "Power BI Workspace Collections"
-    },
-    {
-        "regex":  "RedisCache",
-        "alias":  "Redis Cache"
-    },
-    {
-        "regex":  "Scheduler",
-        "alias":  "Scheduler"
-    },
-    {
-        "regex":  "StreamAnalytics",
-        "alias":  "Stream Analytics"
-    },
-    {
-        "regex":  "TrafficManager",
-        "alias":  "Traffic Manager"
-    },
-    {
-        "module":  "MarketplaceOrdering",
-        "alias":  "Marketplace Ordering"
-    },
-    {
-        "regex":  "Marketplace",
-        "alias":  "Marketplace"
-    },
-    {
-        "regex":  "DataMigration",
-        "alias":  "Data Migration"
-    },
-    {
-        "regex":  "Consumption",
-        "group":  "Billing",
-        "alias":  "Billing"
-    },
-    {
-        "regex":  "Billing",
-        "group":  "Billing",
-        "alias":  "Billing"
-    },
-    {
-        "regex":  "Media",
-        "alias":  "Media Services"
-    },
-    {
-        "regex":  "UsageAggregates",
-        "alias":  "Usage Aggregates"
-    },
-    {
-        "regex":  "EventGrid",
-        "alias":  "Event Grid"
-    },
-    {
-        "regex":  "Container",
-        "alias":  "Container Instances"
-    },
-    {
-        "regex":  "Tags",
-        "alias":  "Tags"
-    },
-    {
-        "regex":  "Accounts",
-        "alias":  "Accounts"
-    },
-    {
-        "regex":  "Reservations",
-        "alias":  "Reservations"
-    },
-    {
-        "regex":  "Subscription",
-        "alias":  "Subscription"
-    },
-    {
-        "regex":  "Policy",
-        "group":  "Resources",
-        "alias":  "Policy"
-    },
-    {
-        "regex":  "ADDomainService",
-        "alias":  "Active Directory Domain Service"
-    },
-    {
-        "regex":  "AD",
-        "group":  "Resources",
-        "alias":  "Active Directory"
-    },
-    {
-        "regex":  "ManagedApplication",
-        "group":  "Resources",
-        "alias":  "Managed Applications"
-    },
-    {
-        "regex":  "Resources",
-        "group":  "Resources",
-        "alias":  "Resources"
-    },
-    {
-        "regex":  "Maps",
-        "alias":  "Maps"
-    },
-    {
-        "regex":  "Aks",
-        "group":  "Aks",
-        "alias":  "Kubernetes Service"
-    },
-    {
-        "regex":  "ManagedServiceIdentity",
-        "group":  "Managed Service Identity",
-        "alias":  "Managed Service Identity"
-    },
-    {
-        "regex":  "ManagementPartner",
-        "alias":  "Management Partner"
-    },
-    {
-        "regex":  "DevSpaces",
-        "group":  "DevSpaces",
-        "alias":  "DevSpaces"
-    },
-    {
-        "module":  "SignalR",
-        "regex":  "SignalR",
-        "alias":  "SignalR"
-    },
-    {
-        "module":  "SignalR",
-        "regex":  "WebPubSub",
-        "alias":  "Web PubSub"
-    },
-    {
-        "regex":  "AzSearch",
-        "alias":  "Search"
-    },
-    {
-        "regex":  "ResourceGraph",
-        "alias":  "ResourceGraph"
-    },
-    {
-        "regex":  "Sentinel",
-        "alias":  "Sentinel"
-    },
-    {
-        "regex":  "Security",
-        "alias":  "Security"
-    },
-    {
-        "regex":  "Kusto",
-        "alias":  "Kusto"
-    },
-    {
-        "module":  "Advisor",
-        "alias":  "Advisor"
-    },
-    {
-        "regex":  "MixedReality",
-        "group":  "Mixed Reality",
-        "alias":  "Mixed Reality"
-    },
-    {
-        "regex":  "SpatialAnchors",
-        "group":  "Mixed Reality",
-        "alias":  "Mixed Reality"
-    },
-    {
-        "regex":  "Blueprint",
-        "alias":  "Blueprint"
-    },
-    {
-        "regex":  "Peering",
-        "group":  "Peering",
-        "alias":  "Peering"
-    },
-    {
-        "regex":  "PeerAsn",
-        "group":  "Peering",
-        "alias":  "Peer Asn"
-    },
-    {
-        "regex":  "NetAppFiles",
-        "alias":  "NetApp Files"
-    },
-    {
-        "regex":  "Attestation",
-        "alias":  "Attestation"
-    },
-    {
-        "regex":  "ManagedServices",
-        "group":  "Managed Services",
-        "alias":  "Managed Services"
-    },
-    {
-        "regex":  "DataShare",
-        "group":  "Data Share",
-        "alias":  "Data Share"
-    },
-    {
-        "regex":  "DataBoxEdge",
-        "alias":  "Data Box Edge"
-    },
-    {
-        "regex":  "DataBox",
-        "alias":  "DataBox"
-    },
-    {
-        "regex":  "AlertsManagement",
-        "alias":  "Alerts Management"
-    },
-    {
-        "regex":  "HealthcareApis",
-        "alias":  "HealthcareApis Service"
-    },
-    {
-        "regex":  "Maintenance",
-        "alias":  "Maintenance"
-    },
-    {
-        "regex":  "CosmosDB",
-        "alias":  "Cosmos DB"
-    },
-    {
-        "regex":  "Support",
-        "alias":  "Support"
-    },
-    {
-        "regex":  "Databricks",
-        "alias":  "Databricks"
-    },
-    {
-        "regex":  "MariaDb",
-        "alias":  "Database for MariaDB"
-    },
-    {
-        "regex":  "TimeSeriesInsights",
-        "alias":  "Time Series Insights"
-    },
-    {
-        "regex":  "MySql",
-        "alias":  "Database for MySQL"
-    },
-    {
-        "regex":  "Portal",
-        "alias":  "Portal"
-    },
-    {
-        "regex":  "PostgreSql",
-        "alias":  "Database for PostgreSQL"
-    },
-    {
-        "module":  "SqlVirtualMachine",
-        "alias":  "Sql VM"
-    },
-    {
-        "module":  "Sql",
-        "alias":  "SQL"
-    },
-    {
-        "regex":  "ImportExport",
-        "alias":  "ImportExport"
-    },
-    {
-        "regex":  "Functions",
-        "alias":  "Functions"
-    },
-    {
-        "regex":  "DesktopVirtualization",
-        "alias":  "DesktopVirtualization"
-    },
-    {
-        "regex":  "AppConfiguration",
-        "alias":  "App Configuration"
-    },
-    {
-        "regex":  "HanaOnAzure",
-        "alias":  "SAP HANA on Azure"
-    },
-    {
-        "regex":  "CustomProviders",
-        "alias":  "Custom Resource Providers"
-    },
-    {
-        "module":  "MonitoringSolutions",
-        "alias":  "Monitoring Solutions"
-    },
-    {
-        "regex":  "ApplicationInsights",
-        "alias":  "Application Insights"
-    },
-    {
-        "regex":  "Monitor",
-        "alias":  "Monitor"
-    },
-    {
-        "regex":  "ConnectedKubernetes",
-        "alias":  "Connected Kubernetes"
-    },
-    {
-        "regex":  "KubernetesConfiguration",
-        "alias":  "Kubernetes Configuration"
-    },
-    {
-        "regex":  "StackHCI",
-        "alias":  "Stack HCI"
-    },
-    {
-        "regex":  "SpringCloud",
-        "alias":  "Spring Cloud"
-    },
-    {
-        "regex":  "ResourceMover",
-        "alias":  "Resource Mover"
-    },
-    {
-        "regex":  "ConnectedMachine",
-        "alias":  "Connected Machine"
-    },
-    {
-        "regex":  "DedicatedHsm",
-        "alias":  "Dedicated HSM"
-    },
-    {
-        "regex":  "Migrate",
-        "alias":  "Migrate"
-    },
-    {
-        "regex":  "DigitalTwins",
-        "alias":  "Digital Twins"
-    },
-    {
-        "regex":  "CloudService",
-        "alias":  "Cloud Services"
-    },
-    {
-        "regex":  "WindowsIotServices",
-        "alias":  "WindowsIotServices"
-    },
-    {
-        "regex":  "CostManagement",
-        "alias":  "Cost Management"
-    },
-    {
-        "regex":  "Communication",
-        "alias":  "Communication Services"
-    },
-    {
-        "regex":  "RedisEnterpriseCache",
-        "alias":  "Redis Enterprise"
-    },
-    {
-        "regex":  "BotService",
-        "alias":  "Bot Services"
-    },
-    {
-        "regex":  "HealthBot",
-        "alias":  "Health Bot"
-    },
-    {
-        "regex":  "Confluent",
-        "alias":  "Confluent"
-    },
-    {
-        "regex":  "DataProtection",
-        "alias":  "Data Protection"
-    },
-    {
-        "alias":  "ProviderHub",
-        "regex":  "ProviderHub"
-    },
-    {
-        "alias":  "Security Insights",
-        "module":  "SecurityInsights"
-    },
-    {
-        "alias":  "Private DNS",
-        "module":  "PrivateDns"
-    },
-    {
-        "alias":  "Quota",
-        "module":  "Quota"
-    },
-    {
-        "regex":  "ContainerInstance",
-        "alias":  "ContainerInstance"
-    },
-    {
-        "alias":  "DiskPool",
-        "module":  "DiskPool"
-    },
-    {
-        "alias":  "Datadog",
-        "regex":  "Datadog"
-    },
-    {
-        "regex":  "ChangeAnalysis",
-        "alias":  "ChangeAnalysis"
-    },
-    {
-        "alias":  "Purview",
-        "regex":  "Purview"
-    },
-    {
-        "alias":  "Elastic",
-        "regex":  "Elastic"
-    },
-    {
-        "regex":  "Logz",
-        "alias":  "Logz"
-    },
-    {
-        "alias":  "DiskPool",
-        "regex":  "DiskPool"
-    },
-    {
-        "alias":  "CustomLocation",
-        "regex":  "CustomLocation"
-    },
-    {
-        "alias":  "EdgeOrder",
-        "module":  "EdgeOrder"
-    },
-    {
-        "alias":  "Lab Services",
-        "module":  "LabServices"
-    },
-    {
-        "alias":  "BareMetal",
-        "module":  "BareMetal"
-    },
-    {
-        "alias":  "ConnectedNetwork",
-        "module":  "ConnectedNetwork"
-    },
-    {
-        "alias":  "ServiceLinker",
-        "module":  "ServiceLinker"
-    },
-    {
-        "module":  "StorageMover",
-        "alias":  "Storage Mover"
-    },
-    {
-        "alias":  "NetworkFunction",
-        "module":  "NetworkFunction"
-    },
-    {
-        "module":  "DynatraceObservability",
-        "alias":  "DynatraceObservability"
-    },
-    {
-        "module":  "DeviceUpdate",
-        "alias":  "DeviceUpdate"
-    },
-    {
-        "alias":  "ElasticSan",
-        "module":  "ElasticSan"
-    },
-    {
-        "alias":  "SSH",
-        "module":  "Ssh"
-    },
-    {
-        "alias":  "Automanage",
-        "module":  "Automanage"
-    },
-    {
-        "alias":  "VoiceServices",
-        "module":  "VoiceServices"
-    },
-    {
-        "module":  "BillingBenefits",
-        "alias":  "BillingBenefits"
-    },
-    {
-        "module":  "LoadTesting",
-        "alias":  "LoadTesting"
-    },
-    {
-        "alias":  "MobileNetwork",
-        "module":  "MobileNetwork"
-    },
-    {
-        "module":  "ArcResourceBridge",
-        "alias":  "ArcResourceBridge"
-    },
-    {
-        "module":  "Workloads",
-        "alias":  "Workloads"
-    },
-    {
-        "alias":  "SelfHelp",
-        "module":  "SelfHelp"
-    },
-    {
-        "module":  "Qumulo",
-        "alias":  "Qumulo"
-    },
-    {
-        "module":  "StorageCache",
-        "alias":  "StorageCache"
-    },
-    {
-        "module":  "NewRelic",
-        "alias":  "NewRelic"
-    },
-    {
-        "module":  "Quantum",
-        "alias":  "Quantum"
-    },
-    {
-        "module":  "GraphServices",
-        "alias":  "GraphServices"
-    },
-    {
-        "module":  "Alb",
-        "alias":  "Alb"
-    },
-    {
-        "module":  "PaloAltoNetworks",
-        "alias":  "PaloAltoNetworks"
-    },
-    {
-        "module":  "DevCenter",
-        "alias":  "DevCenter"
-    },
-    {
-        "alias":  "NetworkCloud",
-        "module":  "NetworkCloud"
-    },
-    {
-        "alias":  "HdInsightOnAks",
-        "module":  "HdInsightOnAks"
-    },
-    {
-        "module":  "NetworkAnalytics",
-        "alias":  "NetworkAnalytics"
-    },
-    {
-        "module":  "Fleet",
-        "alias":  "Fleet"
-    },
-    {
-        "module":  "ManagedNetworkFabric",
-        "alias":  "Managed Network Fabric"
-    },
-    {
-        "module":  "CodeSigning",
-        "alias":  "Code Signing"
-    },
-    {
-        "module":  "FirmwareAnalysis",
-        "alias":  "FirmwareAnalysis"
-    }
+  {
+    "alias": "Container Apps",
+    "module": "App"
+  },
+  {
+    "alias": "Dashboard",
+    "module": "Dashboard",
+    "group": "Grafana"
+  },
+  {
+    "alias": "Confidential Ledger",
+    "module": "ConfidentialLedger"
+  },
+  {
+    "regex": "ApiManagement",
+    "alias": "API Management"
+  },
+  {
+    "module": "MachineLearning",
+    "group": "ML Studio (Classic)",
+    "alias": "ML Studio (Classic)"
+  },
+  {
+    "module": "MachineLearningServices",
+    "alias": "Machine Learning"
+  },
+  {
+    "regex": "ImageBuilder",
+    "alias": "Image Builder"
+  },
+  {
+    "regex": "VMware",
+    "alias": "VMware"
+  },
+  {
+    "module": "GuestConfiguration",
+    "alias": "Guest Configuration"
+  },
+  {
+    "regex": "Snapshot",
+    "group": "Virtual Machines",
+    "alias": "VM Snapshots"
+  },
+  {
+    "module": "Orbital",
+    "alias": "Orbital"
+  },
+  {
+    "regex": "FluidRelay",
+    "alias": "Fluid Relay"
+  },
+  {
+    "regex": "Image",
+    "group": "Virtual Machines",
+    "alias": "VM Images"
+  },
+  {
+    "regex": "Vmss",
+    "group": "Virtual Machines",
+    "alias": "VM Scale Sets"
+  },
+  {
+    "regex": "Vhd",
+    "group": "Virtual Machines",
+    "alias": "VM VHDs"
+  },
+  {
+    "regex": "Disk",
+    "group": "Virtual Machines",
+    "alias": "VM Disks"
+  },
+  {
+    "regex": "ContainerService",
+    "group": "Virtual Machines",
+    "alias": "Container Service"
+  },
+  {
+    "regex": "VM.*Extension",
+    "group": "Virtual Machines",
+    "alias": "VM Extensions"
+  },
+  {
+    "regex": "Compute",
+    "group": "Virtual Machines",
+    "alias": "Virtual Machines"
+  },
+  {
+    "regex": "VM",
+    "group": "Virtual Machines",
+    "alias": "Virtual Machines"
+  },
+  {
+    "regex": "ApplicationGateway",
+    "group": "Network",
+    "alias": "Application Gateway"
+  },
+  {
+    "regex": "ExpressRoute",
+    "group": "Network",
+    "alias": "ExpressRoute"
+  },
+  {
+    "regex": "LoadBalancer",
+    "group": "Network",
+    "alias": "Load Balancer"
+  },
+  {
+    "regex": "VirtualNetwork",
+    "group": "Network",
+    "alias": "Virtual Network"
+  },
+  {
+    "regex": "Vpn",
+    "group": "Network",
+    "alias": "VPN"
+  },
+  {
+    "regex": "Route",
+    "group": "Network",
+    "alias": "Route"
+  },
+  {
+    "group": "DnsResolver",
+    "alias": "DnsResolver"
+  },
+  {
+    "regex": "Dns",
+    "group": "Network",
+    "alias": "DNS"
+  },
+  {
+    "regex": "NetworkWatcher",
+    "group": "Network",
+    "alias": "Network Watcher"
+  },
+  {
+    "regex": "Network",
+    "group": "Network",
+    "alias": "Networking"
+  },
+  {
+    "module": "Nginx",
+    "alias": "Nginx"
+  },
+  {
+    "regex": "FrontDoor",
+    "alias": "Front Door"
+  },
+  {
+    "regex": "AppService",
+    "group": "App Service",
+    "alias": "App Service"
+  },
+  {
+    "regex": "Websites",
+    "group": "App Service",
+    "alias": "App Service"
+  },
+  {
+    "regex": "WebApp",
+    "group": "App Service",
+    "alias": "App Service"
+  },
+  {
+    "regex": "ACS",
+    "alias": "Azure Stack Storage"
+  },
+  {
+    "regex": "AzureStackAdmin",
+    "alias": "Azure Stack Admin"
+  },
+  {
+    "regex": "AzureStackStorage",
+    "alias": "Azure Stack Storage"
+  },
+  {
+    "regex": "DataLakeAnalytics",
+    "group": "Data Lake",
+    "alias": "Data Lake Analytics"
+  },
+  {
+    "regex": "DataLakeStore",
+    "group": "Data Lake",
+    "alias": "Data Lake Store"
+  },
+  {
+    "regex": "DataLake",
+    "group": "Data Lake",
+    "alias": "Data Lake"
+  },
+  {
+    "regex": "Dtl",
+    "group": "DevTest Labs",
+    "alias": "DevTest Labs"
+  },
+  {
+    "regex": "DevTestLabs",
+    "group": "DevTest Labs",
+    "alias": "DevTest Labs"
+  },
+  {
+    "regex": "DataFactory",
+    "group": "Data Factories",
+    "alias": "Data Factories"
+  },
+  {
+    "regex": "DataFactories",
+    "group": "Data Factories",
+    "alias": "Data Factories"
+  },
+  {
+    "regex": "StorageSync",
+    "alias": "StorageSync"
+  },
+  {
+    "regex": "Storage",
+    "alias": "Storage"
+  },
+  {
+    "regex": "Synapse",
+    "alias": "Synapse Analytics"
+  },
+  {
+    "regex": "Relay",
+    "alias": "Relay"
+  },
+  {
+    "regex": "ServiceBus",
+    "alias": "Service Bus"
+  },
+  {
+    "regex": "ContainerRegistry",
+    "alias": "Container Registry"
+  },
+  {
+    "regex": "ServiceFabric",
+    "alias": "Service Fabric"
+  },
+  {
+    "regex": "KeyVault",
+    "alias": "Key Vault"
+  },
+  {
+    "regex": "IotCentral",
+    "alias": "IotCentral"
+  },
+  {
+    "regex": "IotHub",
+    "alias": "IotHub"
+  },
+  {
+    "regex": "DeviceProvisioningServices",
+    "alias": "DPS"
+  },
+  {
+    "regex": "Batch",
+    "alias": "Batch"
+  },
+  {
+    "regex": "AnalysisServices",
+    "alias": "Analysis Services"
+  },
+  {
+    "regex": "Automation",
+    "alias": "Automation"
+  },
+  {
+    "regex": "RecoveryServices",
+    "alias": "Recovery Services"
+  },
+  {
+    "regex": "Backup",
+    "alias": "Backup"
+  },
+  {
+    "regex": "Cdn",
+    "alias": "CDN"
+  },
+  {
+    "regex": "CognitiveService",
+    "alias": "Cognitive Services"
+  },
+  {
+    "regex": "AvailabilitySet",
+    "alias": "Availability Sets"
+  },
+  {
+    "regex": "EventHub",
+    "alias": "Event Hub"
+  },
+  {
+    "regex": "HDInsight",
+    "alias": "HDInsight"
+  },
+  {
+    "regex": "HPCCache",
+    "alias": "HPCCache"
+  },
+  {
+    "regex": "LogicApp",
+    "alias": "Logic Apps"
+  },
+  {
+    "regex": "NotificationHubs",
+    "alias": "Notification Hubs"
+  },
+  {
+    "regex": "OperationalInsights",
+    "alias": "Operational Insights"
+  },
+  {
+    "regex": "PolicyInsights",
+    "alias": "Policy Insights"
+  },
+  {
+    "regex": "PowerBIEmbedded",
+    "group": "Power BI",
+    "alias": "Power BI Embedded Capacity"
+  },
+  {
+    "regex": "PowerBIWorkspace",
+    "group": "Power BI",
+    "alias": "Power BI Workspace Collections"
+  },
+  {
+    "regex": "RedisCache",
+    "alias": "Redis Cache"
+  },
+  {
+    "regex": "Scheduler",
+    "alias": "Scheduler"
+  },
+  {
+    "regex": "StreamAnalytics",
+    "alias": "Stream Analytics"
+  },
+  {
+    "regex": "TrafficManager",
+    "alias": "Traffic Manager"
+  },
+  {
+    "module": "MarketplaceOrdering",
+    "alias": "Marketplace Ordering"
+  },
+  {
+    "regex": "Marketplace",
+    "alias": "Marketplace"
+  },
+  {
+    "regex": "DataMigration",
+    "alias": "Data Migration"
+  },
+  {
+    "regex": "Consumption",
+    "group": "Billing",
+    "alias": "Billing"
+  },
+  {
+    "regex": "Billing",
+    "group": "Billing",
+    "alias": "Billing"
+  },
+  {
+    "regex": "Media",
+    "alias": "Media Services"
+  },
+  {
+    "regex": "UsageAggregates",
+    "alias": "Usage Aggregates"
+  },
+  {
+    "regex": "EventGrid",
+    "alias": "Event Grid"
+  },
+  {
+    "regex": "Container",
+    "alias": "Container Instances"
+  },
+  {
+    "regex": "Tags",
+    "alias": "Tags"
+  },
+  {
+    "regex": "Accounts",
+    "alias": "Accounts"
+  },
+  {
+    "regex": "Reservations",
+    "alias": "Reservations"
+  },
+  {
+    "regex": "Subscription",
+    "alias": "Subscription"
+  },
+  {
+    "regex": "Policy",
+    "group": "Resources",
+    "alias": "Policy"
+  },
+  {
+    "regex": "ADDomainService",
+    "alias": "Active Directory Domain Service"
+  },
+  {
+    "regex": "AD",
+    "group": "Resources",
+    "alias": "Active Directory"
+  },
+  {
+    "regex": "ManagedApplication",
+    "group": "Resources",
+    "alias": "Managed Applications"
+  },
+  {
+    "regex": "Resources",
+    "group": "Resources",
+    "alias": "Resources"
+  },
+  {
+    "regex": "Maps",
+    "alias": "Maps"
+  },
+  {
+    "regex": "Aks",
+    "group": "Aks",
+    "alias": "Kubernetes Service"
+  },
+  {
+    "regex": "ManagedServiceIdentity",
+    "group": "Managed Service Identity",
+    "alias": "Managed Service Identity"
+  },
+  {
+    "regex": "ManagementPartner",
+    "alias": "Management Partner"
+  },
+  {
+    "regex": "DevSpaces",
+    "group": "DevSpaces",
+    "alias": "DevSpaces"
+  },
+  {
+    "module": "SignalR",
+    "regex": "SignalR",
+    "alias": "SignalR"
+  },
+  {
+    "module": "SignalR",
+    "regex": "WebPubSub",
+    "alias": "Web PubSub"
+  },
+  {
+    "regex": "AzSearch",
+    "alias": "Search"
+  },
+  {
+    "regex": "ResourceGraph",
+    "alias": "ResourceGraph"
+  },
+  {
+    "regex": "Sentinel",
+    "alias": "Sentinel"
+  },
+  {
+    "regex": "Security",
+    "alias": "Security"
+  },
+  {
+    "regex": "Kusto",
+    "alias": "Kusto"
+  },
+  {
+    "module": "Advisor",
+    "alias": "Advisor"
+  },
+  {
+    "regex": "MixedReality",
+    "group": "Mixed Reality",
+    "alias": "Mixed Reality"
+  },
+  {
+    "regex": "SpatialAnchors",
+    "group": "Mixed Reality",
+    "alias": "Mixed Reality"
+  },
+  {
+    "regex": "Blueprint",
+    "alias": "Blueprint"
+  },
+  {
+    "regex": "Peering",
+    "group": "Peering",
+    "alias": "Peering"
+  },
+  {
+    "regex": "PeerAsn",
+    "group": "Peering",
+    "alias": "Peer Asn"
+  },
+  {
+    "regex": "NetAppFiles",
+    "alias": "NetApp Files"
+  },
+  {
+    "regex": "Attestation",
+    "alias": "Attestation"
+  },
+  {
+    "regex": "ManagedServices",
+    "group": "Managed Services",
+    "alias": "Managed Services"
+  },
+  {
+    "regex": "DataShare",
+    "group": "Data Share",
+    "alias": "Data Share"
+  },
+  {
+    "regex": "DataBoxEdge",
+    "alias": "Data Box Edge"
+  },
+  {
+    "regex": "DataBox",
+    "alias": "DataBox"
+  },
+  {
+    "regex": "AlertsManagement",
+    "alias": "Alerts Management"
+  },
+  {
+    "regex": "HealthcareApis",
+    "alias": "HealthcareApis Service"
+  },
+  {
+    "regex": "Maintenance",
+    "alias": "Maintenance"
+  },
+  {
+    "regex": "CosmosDB",
+    "alias": "Cosmos DB"
+  },
+  {
+    "regex": "Support",
+    "alias": "Support"
+  },
+  {
+    "regex": "Databricks",
+    "alias": "Databricks"
+  },
+  {
+    "regex": "MariaDb",
+    "alias": "Database for MariaDB"
+  },
+  {
+    "regex": "TimeSeriesInsights",
+    "alias": "Time Series Insights"
+  },
+  {
+    "regex": "MySql",
+    "alias": "Database for MySQL"
+  },
+  {
+    "regex": "Portal",
+    "alias": "Portal"
+  },
+  {
+    "regex": "PostgreSql",
+    "alias": "Database for PostgreSQL"
+  },
+  {
+    "module": "SqlVirtualMachine",
+    "alias": "Sql VM"
+  },
+  {
+    "module": "Sql",
+    "alias": "SQL"
+  },
+  {
+    "regex": "ImportExport",
+    "alias": "ImportExport"
+  },
+  {
+    "regex": "Functions",
+    "alias": "Functions"
+  },
+  {
+    "regex": "DesktopVirtualization",
+    "alias": "DesktopVirtualization"
+  },
+  {
+    "regex": "AppConfiguration",
+    "alias": "App Configuration"
+  },
+  {
+    "regex": "HanaOnAzure",
+    "alias": "SAP HANA on Azure"
+  },
+  {
+    "regex": "CustomProviders",
+    "alias": "Custom Resource Providers"
+  },
+  {
+    "module": "MonitoringSolutions",
+    "alias": "Monitoring Solutions"
+  },
+  {
+    "regex": "ApplicationInsights",
+    "alias": "Application Insights"
+  },
+  {
+    "regex": "Monitor",
+    "alias": "Monitor"
+  },
+  {
+    "regex": "ConnectedKubernetes",
+    "alias": "Connected Kubernetes"
+  },
+  {
+    "regex": "KubernetesConfiguration",
+    "alias": "Kubernetes Configuration"
+  },
+  {
+    "regex": "StackHCI",
+    "alias": "Stack HCI"
+  },
+  {
+    "regex": "SpringCloud",
+    "alias": "Spring Cloud"
+  },
+  {
+    "regex": "ResourceMover",
+    "alias": "Resource Mover"
+  },
+  {
+    "regex": "ConnectedMachine",
+    "alias": "Connected Machine"
+  },
+  {
+    "regex": "DedicatedHsm",
+    "alias": "Dedicated HSM"
+  },
+  {
+    "regex": "Migrate",
+    "alias": "Migrate"
+  },
+  {
+    "regex": "DigitalTwins",
+    "alias": "Digital Twins"
+  },
+  {
+    "regex": "CloudService",
+    "alias": "Cloud Services"
+  },
+  {
+    "regex": "WindowsIotServices",
+    "alias": "WindowsIotServices"
+  },
+  {
+    "regex": "CostManagement",
+    "alias": "Cost Management"
+  },
+  {
+    "regex": "Communication",
+    "alias": "Communication Services"
+  },
+  {
+    "regex": "RedisEnterpriseCache",
+    "alias": "Redis Enterprise"
+  },
+  {
+    "regex": "BotService",
+    "alias": "Bot Services"
+  },
+  {
+    "regex": "HealthBot",
+    "alias": "Health Bot"
+  },
+  {
+    "regex": "Confluent",
+    "alias": "Confluent"
+  },
+  {
+    "regex": "DataProtection",
+    "alias": "Data Protection"
+  },
+  {
+    "alias": "ProviderHub",
+    "regex": "ProviderHub"
+  },
+  {
+    "alias": "Security Insights",
+    "module": "SecurityInsights"
+  },
+  {
+    "alias": "Private DNS",
+    "module": "PrivateDns"
+  },
+  {
+    "alias": "Quota",
+    "module": "Quota"
+  },
+  {
+    "regex": "ContainerInstance",
+    "alias": "ContainerInstance"
+  },
+  {
+    "alias": "DiskPool",
+    "module": "DiskPool"
+  },
+  {
+    "alias": "Datadog",
+    "regex": "Datadog"
+  },
+  {
+    "regex": "ChangeAnalysis",
+    "alias": "ChangeAnalysis"
+  },
+  {
+    "alias": "Purview",
+    "regex": "Purview"
+  },
+  {
+    "alias": "Elastic",
+    "regex": "Elastic"
+  },
+  {
+    "regex": "Logz",
+    "alias": "Logz"
+  },
+  {
+    "alias": "DiskPool",
+    "regex": "DiskPool"
+  },
+  {
+    "alias": "CustomLocation",
+    "regex": "CustomLocation"
+  },
+  {
+    "alias": "EdgeOrder",
+    "module": "EdgeOrder"
+  },
+  {
+    "alias": "Lab Services",
+    "module": "LabServices"
+  },
+  {
+    "alias": "BareMetal",
+    "module": "BareMetal"
+  },
+  {
+    "alias": "ConnectedNetwork",
+    "module": "ConnectedNetwork"
+  },
+  {
+    "alias": "ServiceLinker",
+    "module": "ServiceLinker"
+  },
+  {
+    "module": "StorageMover",
+    "alias": "Storage Mover"
+  },
+  {
+    "alias": "NetworkFunction",
+    "module": "NetworkFunction"
+  },
+  {
+    "module": "DynatraceObservability",
+    "alias": "DynatraceObservability"
+  },
+  {
+    "module": "DeviceUpdate",
+    "alias": "DeviceUpdate"
+  },
+  {
+    "alias": "ElasticSan",
+    "module": "ElasticSan"
+  },
+  {
+    "alias": "SSH",
+    "module": "Ssh"
+  },
+  {
+    "alias": "Automanage",
+    "module": "Automanage"
+  },
+  {
+    "alias": "VoiceServices",
+    "module": "VoiceServices"
+  },
+  {
+    "module": "BillingBenefits",
+    "alias": "BillingBenefits"
+  },
+  {
+    "module": "LoadTesting",
+    "alias": "LoadTesting"
+  },
+  {
+    "alias": "MobileNetwork",
+    "module": "MobileNetwork"
+  },
+  {
+    "module": "ArcResourceBridge",
+    "alias": "ArcResourceBridge"
+  },
+  {
+    "module": "Workloads",
+    "alias": "Workloads"
+  },
+  {
+    "alias": "SelfHelp",
+    "module": "SelfHelp"
+  },
+  {
+    "module": "Qumulo",
+    "alias": "Qumulo"
+  },
+  {
+    "module": "StorageCache",
+    "alias": "StorageCache"
+  },
+  {
+    "module": "NewRelic",
+    "alias": "NewRelic"
+  },
+  {
+    "module": "Quantum",
+    "alias": "Quantum"
+  },
+  {
+    "module": "GraphServices",
+    "alias": "GraphServices"
+  },
+  {
+    "module": "Alb",
+    "alias": "Alb"
+  },
+  {
+    "module": "PaloAltoNetworks",
+    "alias": "PaloAltoNetworks"
+  },
+  {
+    "module": "DevCenter",
+    "alias": "DevCenter"
+  },
+  {
+    "alias": "NetworkCloud",
+    "module": "NetworkCloud"
+  },
+  {
+    "alias": "HdInsightOnAks",
+    "module": "HdInsightOnAks"
+  },
+  {
+    "module": "NetworkAnalytics",
+    "alias": "NetworkAnalytics"
+  },
+  {
+    "module": "Fleet",
+    "alias": "Fleet"
+  },
+  {
+    "module": "ManagedNetworkFabric",
+    "alias": "Managed Network Fabric"
+  },
+  {
+    "module": "CodeSigning",
+    "alias": "Code Signing"
+  },
+  {
+    "module": "FirmwareAnalysis",
+    "alias": "FirmwareAnalysis"
+  },
+  {
+    "module": "EdgeZones",
+    "alias": "EdgeZones"
+  }
 ]
diff --git a/tools/TestFx/Coverage/Baseline.csv b/tools/TestFx/Coverage/Baseline.csv
index 591edcfc56cd..6193a1d06e9c 100644
--- a/tools/TestFx/Coverage/Baseline.csv
+++ b/tools/TestFx/Coverage/Baseline.csv
@@ -7,33 +7,35 @@
 "AlertsManagement","47.06%"
 "AnalysisServices","69.23%"
 "ApiManagement","94.93%"
-"App","62.50%"
+"App","68.69%"
 "AppConfiguration","50.00%"
-"ApplicationInsights","62.16%"
+"ApplicationInsights","64.86%"
 "ArcResourceBridge","87.50%"
 "Attestation","63.64%"
 "Automanage","47.06%"
-"Automation","39.00%"
+"Automation","38.00%"
 "BareMetal","100.00%"
-"Batch","81.94%"
+"Batch","79.17%"
 "Billing","100.00%"
 "BillingBenefits","100.00%"
 "Blueprint","23.08%"
 "BotService","66.67%"
-"Cdn","55.48%"
+"Cdn","54.84%"
 "ChangeAnalysis","100.00%"
 "CloudService","73.33%"
+"CodeSigning","0.00%"
 "CognitiveServices","100.00%"
-"Communication","87.50%"
+"Communication","31.82%"
 "Compute","82.73%"
 "ConfidentialLedger","100.00%"
 "Confluent","80.00%"
 "ConnectedKubernetes","60.00%"
-"ConnectedMachine","94.44%"
+"ConnectedMachine","95.45%"
 "ConnectedNetwork","77.42%"
+"ConnectedVMware","60.53%"
 "ContainerInstance","87.50%"
 "ContainerRegistry","80.00%"
-"CosmosDB","85.00%"
+"CosmosDB","85.63%"
 "CostManagement","72.73%"
 "CustomLocation","100.00%"
 "CustomProviders","57.14%"
@@ -46,14 +48,13 @@
 "DataLakeAnalytics","58.06%"
 "DataLakeStore","83.72%"
 "DataMigration","34.69%"
-"DataProtection","57.14%"
+"DataProtection","56.00%"
 "DataShare","94.44%"
 "DedicatedHsm","100.00%"
 "DesktopVirtualization","100.00%"
-"DevCenter","68.49%"
+"DevCenter","62.79%"
 "DeviceProvisioningServices","44.44%"
 "DeviceUpdate","70.00%"
-"DevSpaces","100.00%"
 "DevTestLabs","0.00%"
 "DigitalTwins","80.00%"
 "DiskPool","87.50%"
@@ -61,18 +62,21 @@
 "DnsResolver","100.00%"
 "DynatraceObservability","88.24%"
 "EdgeOrder","65.00%"
+"EdgeZones","100.00%"
 "Elastic","91.67%"
 "ElasticSan","100.00%"
 "EventGrid","67.80%"
 "EventHub","87.76%"
+"FirmwareAnalysis","100.00%"
+"Fleet","95.24%"
 "FluidRelay","75.00%"
 "FrontDoor","91.18%"
 "Functions","100.00%"
 "GraphServices","100.00%"
 "GuestConfiguration","100.00%"
 "HanaOnAzure","100.00%"
-"HDInsight","31.25%"
-"HdInsightOnAks","100.00%"
+"HDInsight","52.08%"
+"HdInsightOnAks","86.21%"
 "HealthBot","100.00%"
 "HealthcareApis","100.00%"
 "HPCCache","92.31%"
@@ -82,30 +86,32 @@
 "IotHub","0.00%"
 "KeyVault","22.09%"
 "KubernetesConfiguration","100.00%"
-"Kusto","89.66%"
+"Kusto","89.23%"
 "LabServices","77.14%"
 "LoadTesting","100.00%"
 "LogicApp","98.04%"
 "Logz","88.46%"
 "MachineLearning","0.00%"
 "MachineLearningServices","56.10%"
-"Maintenance","81.82%"
+"Maintenance","90.91%"
+"ManagedNetworkFabric","98.39%"
 "ManagedServiceIdentity","100.00%"
 "ManagedServices","0.00%"
 "ManagementPartner","100.00%"
 "Maps","100.00%"
-"MariaDb","84.21%"
-"Marketplace","90.00%"
+"MariaDb","100.00%"
+"Marketplace","93.94%"
 "MarketplaceOrdering","100.00%"
 "Media","0.00%"
-"Migrate","80.65%"
+"Migrate","75.61%"
 "MixedReality","94.74%"
 "MobileNetwork","49.12%"
-"Monitor","42.31%"
+"Monitor","18.02%"
 "MonitoringSolutions","100.00%"
 "MySql","92.86%"
-"NetAppFiles","76.81%"
-"Network","84.35%"
+"NetAppFiles","78.87%"
+"Network","84.63%"
+"NetworkAnalytics","100.00%"
 "NetworkCloud","97.94%"
 "NetworkFunction","0.00%"
 "NewRelic","88.24%"
@@ -118,45 +124,46 @@
 "PolicyInsights","100.00%"
 "Portal","100.00%"
 "PostgreSql","82.05%"
-"PowerBIEmbedded","92.31%"
+"PowerBIEmbedded","100.00%"
 "PrivateDns","100.00%"
 "ProviderHub","80.00%"
 "Purview","8.70%"
 "Quantum","100.00%"
 "Qumulo","100.00%"
-"Quota","71.43%"
-"RecoveryServices","65.83%"
+"Quota","100.00%"
+"RecoveryServices","66.67%"
 "RedisCache","100.00%"
 "RedisEnterpriseCache","53.33%"
 "Relay","100.00%"
 "Reservations","100.00%"
 "ResourceGraph","100.00%"
 "ResourceMover","100.00%"
-"Resources","59.49%"
+"Resources","57.79%"
 "Search","82.35%"
-"Security","82.35%"
+"Security","88.06%"
 "SecurityInsights","88.71%"
-"SelfHelp","50.00%"
+"SelfHelp","16.67%"
 "ServiceBus","93.88%"
 "ServiceFabric","93.22%"
 "ServiceLinker","92.31%"
 "SignalR","90.62%"
 "SpringCloud","82.86%"
-"Sql","61.74%"
+"Sql","62.22%"
 "SqlVirtualMachine","93.75%"
 "Ssh","50.00%"
 "StackHCI","40.74%"
-"Storage","41.67%"
+"StackHCIVM","61.29%"
+"Storage","41.76%"
 "StorageCache","70.00%"
 "StorageMover","100.00%"
 "StorageSync","80.00%"
 "StreamAnalytics","100.00%"
-"Subscription","50.00%"
+"Subscription","44.44%"
 "Support","75.00%"
 "Synapse","48.80%"
 "TimeSeriesInsights","100.00%"
 "TrafficManager","90.91%"
-"VMware","100.00%"
+"VMware","86.96%"
 "VoiceServices","100.00%"
 "Websites","87.16%"
 "WindowsIotServices","100.00%"