diff --git a/config.py b/config.py
index 3c66f3dc..0842e065 100644
--- a/config.py
+++ b/config.py
@@ -393,10 +393,10 @@ ALIASES = {
             "OKEWhite": "ContainerEngineWhite",
         },
         "database": {
-            "AutonomousDatabase": "ADB",
-            "AutonomousDatabaseWhite": "ADBWhite",
-            "Databaseservice": "DBService",
-            "DatabaseserviceWhite": "DBServiceWhite",
+            "Autonomous": "ADB",
+            "AutonomousWhite": "ADBWhite",
+            "DatabaseService": "DBService",
+            "DatabaseServiceWhite": "DBServiceWhite",
         }
     },
     "programming": {
diff --git a/diagrams/azure/compute.py b/diagrams/azure/compute.py
index 2a42b879..d211a686 100644
--- a/diagrams/azure/compute.py
+++ b/diagrams/azure/compute.py
@@ -96,3 +96,4 @@ class VM(_Compute):
 
 ACR = ContainerRegistries
 AKS = KubernetesServices
+VMSS = VMScaleSet
diff --git a/diagrams/oci/database.py b/diagrams/oci/database.py
index ec9e5ce3..84048342 100644
--- a/diagrams/oci/database.py
+++ b/diagrams/oci/database.py
@@ -82,7 +82,7 @@ class Stream(_Database):
 
 # Aliases
 
-ADB = AutonomousDatabase
-ADBWhite = AutonomousDatabaseWhite
-DBService = Databaseservice
-DBServiceWhite = DatabaseserviceWhite
+ADB = Autonomous
+ADBWhite = AutonomousWhite
+DBService = DatabaseService
+DBServiceWhite = DatabaseServiceWhite
diff --git a/diagrams/onprem/analytics.py b/diagrams/onprem/analytics.py
index 182c28cd..df70419b 100644
--- a/diagrams/onprem/analytics.py
+++ b/diagrams/onprem/analytics.py
@@ -40,14 +40,14 @@ class Norikra(_Analytics):
     _icon = "norikra.png"
 
 
-class Presto(_Analytics):
-    _icon = "presto.png"
-
-
 class Powerbi(_Analytics):
     _icon = "powerbi.png"
 
 
+class Presto(_Analytics):
+    _icon = "presto.png"
+
+
 class Singer(_Analytics):
     _icon = "singer.png"
 
diff --git a/docs/nodes/azure.md b/docs/nodes/azure.md
index cb051102..a6c91e79 100644
--- a/docs/nodes/azure.md
+++ b/docs/nodes/azure.md
@@ -39,7 +39,7 @@ Node classes list of azure provider.
 - **diagrams.azure.compute.VMClassic**
 - **diagrams.azure.compute.VMImages**
 - **diagrams.azure.compute.VMLinux**
-- **diagrams.azure.compute.VMScaleSet**
+- **diagrams.azure.compute.VMScaleSet**, **VMSS** (alias)
 - **diagrams.azure.compute.VMWindows**
 - **diagrams.azure.compute.VM**
 
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index 42fe874f..fcedc97e 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -47,12 +47,12 @@ Node classes list of oci provider.
 
 ## oci.database
 
-- **diagrams.oci.database.AutonomousWhite**
-- **diagrams.oci.database.Autonomous**
+- **diagrams.oci.database.AutonomousWhite**, **ADBWhite** (alias)
+- **diagrams.oci.database.Autonomous**, **ADB** (alias)
 - **diagrams.oci.database.BigdataServiceWhite**
 - **diagrams.oci.database.BigdataService**
-- **diagrams.oci.database.DatabaseServiceWhite**
-- **diagrams.oci.database.DatabaseService**
+- **diagrams.oci.database.DatabaseServiceWhite**, **DBServiceWhite** (alias)
+- **diagrams.oci.database.DatabaseService**, **DBService** (alias)
 - **diagrams.oci.database.DataflowApacheWhite**
 - **diagrams.oci.database.DataflowApache**
 - **diagrams.oci.database.DcatWhite**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 2d813727..585dcb75 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -20,8 +20,8 @@ Node classes list of onprem provider.
 - **diagrams.onprem.analytics.Hive**
 - **diagrams.onprem.analytics.Metabase**
 - **diagrams.onprem.analytics.Norikra**
-- **diagrams.onprem.analytics.Presto**
 - **diagrams.onprem.analytics.Powerbi**, **PowerBI** (alias)
+- **diagrams.onprem.analytics.Presto**
 - **diagrams.onprem.analytics.Singer**
 - **diagrams.onprem.analytics.Spark**
 - **diagrams.onprem.analytics.Storm**