diff --git a/diagrams/azure/compute.py b/diagrams/azure/compute.py
index f900bc91..e2e23ba6 100644
--- a/diagrams/azure/compute.py
+++ b/diagrams/azure/compute.py
@@ -12,7 +12,7 @@ class AppServices(_Compute):
     _icon = "app-services.png"
 
 
-class AutomanagedVm(_Compute):
+class AutomanagedVM(_Compute):
     _icon = "automanaged-vm.png"
 
 
@@ -84,7 +84,7 @@ class OsImages(_Compute):
     _icon = "os-images.png"
 
 
-class SapHanaOnAzure(_Compute):
+class SAPHANAOnAzure(_Compute):
     _icon = "sap-hana-on-azure.png"
 
 
@@ -100,27 +100,27 @@ class SpringCloud(_Compute):
     _icon = "spring-cloud.png"
 
 
-class VmClassic(_Compute):
+class VMClassic(_Compute):
     _icon = "vm-classic.png"
 
 
-class VmImages(_Compute):
+class VMImages(_Compute):
     _icon = "vm-images.png"
 
 
-class VmLinux(_Compute):
+class VMLinux(_Compute):
     _icon = "vm-linux.png"
 
 
-class VmScaleSet(_Compute):
+class VMScaleSet(_Compute):
     _icon = "vm-scale-set.png"
 
 
-class VmWindows(_Compute):
+class VMWindows(_Compute):
     _icon = "vm-windows.png"
 
 
-class Vm(_Compute):
+class VM(_Compute):
     _icon = "vm.png"
 
 
diff --git a/diagrams/azure/database.py b/diagrams/azure/database.py
index 3fb67911..a9127a85 100644
--- a/diagrams/azure/database.py
+++ b/diagrams/azure/database.py
@@ -60,31 +60,31 @@ class ManagedDatabases(_Database):
     _icon = "managed-databases.png"
 
 
-class SqlDatabases(_Database):
+class SQLDatabases(_Database):
     _icon = "sql-databases.png"
 
 
-class SqlDatawarehouse(_Database):
+class SQLDatawarehouse(_Database):
     _icon = "sql-datawarehouse.png"
 
 
-class SqlManagedInstances(_Database):
+class SQLManagedInstances(_Database):
     _icon = "sql-managed-instances.png"
 
 
-class SqlServerStretchDatabases(_Database):
+class SQLServerStretchDatabases(_Database):
     _icon = "sql-server-stretch-databases.png"
 
 
-class SqlServers(_Database):
+class SQLServers(_Database):
     _icon = "sql-servers.png"
 
 
-class SqlVm(_Database):
+class SQLVM(_Database):
     _icon = "sql-vm.png"
 
 
-class Sql(_Database):
+class SQL(_Database):
     _icon = "sql.png"
 
 
diff --git a/diagrams/azure/identity.py b/diagrams/azure/identity.py
index bf50a30f..a7913728 100644
--- a/diagrams/azure/identity.py
+++ b/diagrams/azure/identity.py
@@ -20,19 +20,19 @@ class ActiveDirectory(_Identity):
     _icon = "active-directory.png"
 
 
-class AdB2C(_Identity):
+class ADB2C(_Identity):
     _icon = "ad-b2c.png"
 
 
-class AdDomainServices(_Identity):
+class ADDomainServices(_Identity):
     _icon = "ad-domain-services.png"
 
 
-class AdIdentityProtection(_Identity):
+class ADIdentityProtection(_Identity):
     _icon = "ad-identity-protection.png"
 
 
-class AdPrivilegedIdentityManagement(_Identity):
+class ADPrivilegedIdentityManagement(_Identity):
     _icon = "ad-privileged-identity-management.png"
 
 
diff --git a/diagrams/azure/integration.py b/diagrams/azure/integration.py
index 2bd57d14..369cd97b 100644
--- a/diagrams/azure/integration.py
+++ b/diagrams/azure/integration.py
@@ -8,11 +8,11 @@ class _Integration(_Azure):
     _icon_dir = "resources/azure/integration"
 
 
-class ApiForFhir(_Integration):
+class APIForFhir(_Integration):
     _icon = "api-for-fhir.png"
 
 
-class ApiManagement(_Integration):
+class APIManagement(_Integration):
     _icon = "api-management.png"
 
 
diff --git a/diagrams/azure/ml.py b/diagrams/azure/ml.py
index 625543d0..295a261e 100644
--- a/diagrams/azure/ml.py
+++ b/diagrams/azure/ml.py
@@ -8,7 +8,7 @@ class _Ml(_Azure):
     _icon_dir = "resources/azure/ml"
 
 
-class BatchAi(_Ml):
+class BatchAI(_Ml):
     _icon = "batch-ai.png"
 
 
diff --git a/diagrams/azure/network.py b/diagrams/azure/network.py
index 5b95ea02..23dd69c0 100644
--- a/diagrams/azure/network.py
+++ b/diagrams/azure/network.py
@@ -16,7 +16,7 @@ class ApplicationSecurityGroups(_Network):
     _icon = "application-security-groups.png"
 
 
-class CdnProfiles(_Network):
+class CDNProfiles(_Network):
     _icon = "cdn-profiles.png"
 
 
@@ -24,15 +24,15 @@ class Connections(_Network):
     _icon = "connections.png"
 
 
-class DdosProtectionPlans(_Network):
+class DDOSProtectionPlans(_Network):
     _icon = "ddos-protection-plans.png"
 
 
-class DnsPrivateZones(_Network):
+class DNSPrivateZones(_Network):
     _icon = "dns-private-zones.png"
 
 
-class DnsZones(_Network):
+class DNSZones(_Network):
     _icon = "dns-zones.png"
 
 
diff --git a/diagrams/azure/web.py b/diagrams/azure/web.py
index e037ad3d..b99a61cc 100644
--- a/diagrams/azure/web.py
+++ b/diagrams/azure/web.py
@@ -8,7 +8,7 @@ class _Web(_Azure):
     _icon_dir = "resources/azure/web"
 
 
-class ApiConnections(_Web):
+class APIConnections(_Web):
     _icon = "api-connections.png"
 
 
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index b82da74d..c6fe5852 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -23,7 +23,7 @@ Node classes list of azure provider.
 ## azure.compute
 
 - **diagrams.azure.compute.AppServices**
-- **diagrams.azure.compute.AutomanagedVm**
+- **diagrams.azure.compute.AutomanagedVM**
 - **diagrams.azure.compute.AvailabilitySets**
 - **diagrams.azure.compute.BatchAccounts**
 - **diagrams.azure.compute.CitrixVirtualDesktopsEssentials**
@@ -41,16 +41,16 @@ Node classes list of azure provider.
 - **diagrams.azure.compute.KubernetesServices**, **AKS** (alias)
 - **diagrams.azure.compute.MeshApplications**
 - **diagrams.azure.compute.OsImages**
-- **diagrams.azure.compute.SapHanaOnAzure**
+- **diagrams.azure.compute.SAPHANAOnAzure**
 - **diagrams.azure.compute.ServiceFabricClusters**
 - **diagrams.azure.compute.SharedImageGalleries**
 - **diagrams.azure.compute.SpringCloud**
-- **diagrams.azure.compute.VmClassic**
-- **diagrams.azure.compute.VmImages**
-- **diagrams.azure.compute.VmLinux**
-- **diagrams.azure.compute.VmScaleSet**
-- **diagrams.azure.compute.VmWindows**
-- **diagrams.azure.compute.Vm**
+- **diagrams.azure.compute.VMClassic**
+- **diagrams.azure.compute.VMImages**
+- **diagrams.azure.compute.VMLinux**
+- **diagrams.azure.compute.VMScaleSet**, **VMSS** (alias)
+- **diagrams.azure.compute.VMWindows**
+- **diagrams.azure.compute.VM**
 - **diagrams.azure.compute.Workspaces**
 
 ## azure.database
@@ -68,13 +68,13 @@ Node classes list of azure provider.
 - **diagrams.azure.database.ElasticJobAgents**
 - **diagrams.azure.database.InstancePools**
 - **diagrams.azure.database.ManagedDatabases**
-- **diagrams.azure.database.SqlDatabases**
-- **diagrams.azure.database.SqlDatawarehouse**
-- **diagrams.azure.database.SqlManagedInstances**
-- **diagrams.azure.database.SqlServerStretchDatabases**
-- **diagrams.azure.database.SqlServers**
-- **diagrams.azure.database.SqlVm**
-- **diagrams.azure.database.Sql**
+- **diagrams.azure.database.SQLDatabases**
+- **diagrams.azure.database.SQLDatawarehouse**
+- **diagrams.azure.database.SQLManagedInstances**
+- **diagrams.azure.database.SQLServerStretchDatabases**
+- **diagrams.azure.database.SQLServers**
+- **diagrams.azure.database.SQLVM**
+- **diagrams.azure.database.SQL**
 - **diagrams.azure.database.SsisLiftAndShiftIr**
 - **diagrams.azure.database.SynapseAnalytics**
 - **diagrams.azure.database.VirtualClusters**
@@ -126,10 +126,10 @@ Node classes list of azure provider.
 - **diagrams.azure.identity.AccessReview**
 - **diagrams.azure.identity.ActiveDirectoryConnectHealth**
 - **diagrams.azure.identity.ActiveDirectory**
-- **diagrams.azure.identity.AdB2C**
-- **diagrams.azure.identity.AdDomainServices**
-- **diagrams.azure.identity.AdIdentityProtection**
-- **diagrams.azure.identity.AdPrivilegedIdentityManagement**
+- **diagrams.azure.identity.ADB2C**
+- **diagrams.azure.identity.ADDomainServices**
+- **diagrams.azure.identity.ADIdentityProtection**
+- **diagrams.azure.identity.ADPrivilegedIdentityManagement**
 - **diagrams.azure.identity.AppRegistrations**
 - **diagrams.azure.identity.ConditionalAccess**
 - **diagrams.azure.identity.EnterpriseApplications**
@@ -141,8 +141,8 @@ Node classes list of azure provider.
 
 ## azure.integration
 
-- **diagrams.azure.integration.ApiForFhir**
-- **diagrams.azure.integration.ApiManagement**
+- **diagrams.azure.integration.APIForFhir**
+- **diagrams.azure.integration.APIManagement**
 - **diagrams.azure.integration.AppConfiguration**
 - **diagrams.azure.integration.DataCatalog**
 - **diagrams.azure.integration.EventGridDomains**
@@ -184,7 +184,7 @@ Node classes list of azure provider.
 
 ## azure.ml
 
-- **diagrams.azure.ml.BatchAi**
+- **diagrams.azure.ml.BatchAI**
 - **diagrams.azure.ml.BotServices**
 - **diagrams.azure.ml.CognitiveServices**
 - **diagrams.azure.ml.GenomicsAccounts**
@@ -203,11 +203,11 @@ Node classes list of azure provider.
 
 - **diagrams.azure.network.ApplicationGateway**
 - **diagrams.azure.network.ApplicationSecurityGroups**
-- **diagrams.azure.network.CdnProfiles**
+- **diagrams.azure.network.CDNProfiles**
 - **diagrams.azure.network.Connections**
-- **diagrams.azure.network.DdosProtectionPlans**
-- **diagrams.azure.network.DnsPrivateZones**
-- **diagrams.azure.network.DnsZones**
+- **diagrams.azure.network.DDOSProtectionPlans**
+- **diagrams.azure.network.DNSPrivateZones**
+- **diagrams.azure.network.DNSZones**
 - **diagrams.azure.network.ExpressrouteCircuits**
 - **diagrams.azure.network.Firewall**
 - **diagrams.azure.network.FrontDoors**
@@ -260,7 +260,7 @@ Node classes list of azure provider.
 
 ## azure.web
 
-- **diagrams.azure.web.ApiConnections**
+- **diagrams.azure.web.APIConnections**
 - **diagrams.azure.web.AppServiceCertificates**
 - **diagrams.azure.web.AppServiceDomains**
 - **diagrams.azure.web.AppServiceEnvironments**