diff --git a/config.py b/config.py
index 08b34004..c8198832 100644
--- a/config.py
+++ b/config.py
@@ -88,7 +88,7 @@ UPPER_WORDS = {
     "outscale": ("osc",),
     "openstack": ("rpm", "loci", "nfv", "ec2api"),
     "pve": ("pve"),
-    "ibm": ("ibm"),
+    "ibm": ("ibm", "sql", "api", "cdn", "dns", "vpn", "vpc"),
 }
 
 TITLE_WORDS = {
@@ -452,7 +452,34 @@ ALIASES = {
     "outscale": {
         "Osc": "OSC",
     },
-    "ibm": {},
+    "ibm": {
+        "compute": {
+            "HpVirtualServers": "HPVirtualServers",
+            "Vmware": "VMware",
+        },
+        "data": {
+            "TmsDataInterface": "TMSDataInterface"
+        },
+        "database": {
+            "ComposeMysql": "ComposeMySQL",
+            "ComposeRethinkdb": "ComposeRethinkDB",
+            "ComposeScylladb": "ComposeScyllaDB",
+            "Db2Warehouse": "DB2Warehouse",
+            "Db2": "DB2",
+            "Edb": "EDB",
+            "Elasticsearch": "ElasticSearch",
+            "HyperProtectDbaas": "HyperProtectDBaaS",
+            "Mongodb": "MongoDB",
+            "Postgresql": "PostgreSQL",
+            "Rabbitmq": "RabbitMQ",
+        },
+        "devops": {
+            "Devops": "DevOps"
+        },
+        "security": {
+            "OpenBsd": "OpenBSD"
+        }
+    },
     "generic": {},
     "openstack": {
         "user": {
diff --git a/diagrams/ibm/compute.py b/diagrams/ibm/compute.py
index 06591716..aaf01f72 100644
--- a/diagrams/ibm/compute.py
+++ b/diagrams/ibm/compute.py
@@ -68,8 +68,11 @@ class Vmware(_Compute):
     _icon = "vmware.png"
 
 
-class VpcVirtualServer(_Compute):
+class VPCVirtualServer(_Compute):
     _icon = "vpc-virtual-server.png"
 
 
 # Aliases
+
+HPVirtualServers = HpVirtualServers
+VMware = Vmware
diff --git a/diagrams/ibm/database.py b/diagrams/ibm/database.py
index 3ba8b5cf..ebed3cc5 100644
--- a/diagrams/ibm/database.py
+++ b/diagrams/ibm/database.py
@@ -92,8 +92,20 @@ class Redis(_Database):
     _icon = "redis.png"
 
 
-class SqlQuery(_Database):
+class SQLQuery(_Database):
     _icon = "sql-query.png"
 
 
 # Aliases
+
+ComposeMySQL = ComposeMysql
+ComposeRethinkDB = ComposeRethinkdb
+ComposeScyllaDB = ComposeScylladb
+DB2Warehouse = Db2Warehouse
+DB2 = Db2
+EDB = Edb
+ElasticSearch = Elasticsearch
+HyperProtectDBaaS = HyperProtectDbaas
+MongoDB = Mongodb
+PostgreSQL = Postgresql
+RabbitMQ = Rabbitmq
diff --git a/diagrams/ibm/devtools.py b/diagrams/ibm/devtools.py
index 3c01e75d..26505436 100644
--- a/diagrams/ibm/devtools.py
+++ b/diagrams/ibm/devtools.py
@@ -16,7 +16,7 @@ class Alloy(_Devtools):
     _icon = "alloy.png"
 
 
-class ApiGateway(_Devtools):
+class APIGateway(_Devtools):
     _icon = "api-gateway.png"
 
 
diff --git a/diagrams/ibm/integration.py b/diagrams/ibm/integration.py
index 8564720b..0609a099 100644
--- a/diagrams/ibm/integration.py
+++ b/diagrams/ibm/integration.py
@@ -8,7 +8,7 @@ class _Integration(_IBM):
     _icon_dir = "resources/ibm/integration"
 
 
-class ApiConnect(_Integration):
+class APIConnect(_Integration):
     _icon = "api-connect.png"
 
 
diff --git a/diagrams/ibm/network.py b/diagrams/ibm/network.py
index 8c76390c..0584c1a6 100644
--- a/diagrams/ibm/network.py
+++ b/diagrams/ibm/network.py
@@ -8,7 +8,7 @@ class _Network(_IBM):
     _icon_dir = "resources/ibm/network"
 
 
-class Cdn(_Network):
+class CDN(_Network):
     _icon = "cdn.png"
 
 
@@ -24,7 +24,7 @@ class DirectLink(_Network):
     _icon = "direct-link.png"
 
 
-class Dns(_Network):
+class DNS(_Network):
     _icon = "dns.png"
 
 
@@ -32,7 +32,7 @@ class Firewall(_Network):
     _icon = "firewall.png"
 
 
-class IpsecVpn(_Network):
+class IpsecVPN(_Network):
     _icon = "ipsec-vpn.png"
 
 
@@ -60,19 +60,19 @@ class Vlan(_Network):
     _icon = "vlan.png"
 
 
-class VpcEndpoints(_Network):
+class VPCEndpoints(_Network):
     _icon = "vpc-endpoints.png"
 
 
-class VpcFlowlogs(_Network):
+class VPCFlowlogs(_Network):
     _icon = "vpc-flowlogs.png"
 
 
-class Vpc(_Network):
+class VPC(_Network):
     _icon = "vpc.png"
 
 
-class Vpn(_Network):
+class VPN(_Network):
     _icon = "vpn.png"
 
 
diff --git a/diagrams/ibm/security.py b/diagrams/ibm/security.py
index 3837e0ee..9a3b41a8 100644
--- a/diagrams/ibm/security.py
+++ b/diagrams/ibm/security.py
@@ -65,3 +65,5 @@ class Twilio(_Security):
 
 
 # Aliases
+
+OpenBSD = OpenBsd