diff --git a/config.py b/config.py
index 5bed570e..69900b8e 100644
--- a/config.py
+++ b/config.py
@@ -66,7 +66,7 @@ UPPER_WORDS = {
     "oci": ("oci",),
     "elastic": ("apm", "siem", "ece", "eck"),
     "generic": ("vpn", "ios", "xen"),
-    "openstack": ("rpm", "loci", "nfv"),
+    "openstack": ("rpm", "loci", "nfv", "ec2api"),
 }
 
 TITLE_WORDS = {
@@ -387,11 +387,15 @@ ALIASES = {
     },
     "generic": {},
     "openstack": {
-        "apiproxies": {
-            "Ec2api": "EC2API",
-        },
         "user": {
             "Openstackclient": "OpenStackClient",
         },
+        "billing": {
+            "Cloudkitty": "CloudKitty",
+        },
+        "deployment": {
+            "Kolla": "KollaAnsible",
+            "Tripleo": "TripleO",
+        }
     },
 }
diff --git a/diagrams/openstack/apiproxies.py b/diagrams/openstack/apiproxies.py
index 2caf0f4c..d9b642bc 100644
--- a/diagrams/openstack/apiproxies.py
+++ b/diagrams/openstack/apiproxies.py
@@ -8,10 +8,8 @@ class _Apiproxies(_OpenStack):
     _icon_dir = "resources/openstack/apiproxies"
 
 
-class Ec2Api(_Apiproxies):
+class EC2API(_Apiproxies):
     _icon = "ec2api.png"
 
 
 # Aliases
-
-EC2API = Ec2api
diff --git a/diagrams/openstack/billing.py b/diagrams/openstack/billing.py
index 1da5da63..fabe17fb 100644
--- a/diagrams/openstack/billing.py
+++ b/diagrams/openstack/billing.py
@@ -13,3 +13,5 @@ class Cloudkitty(_Billing):
 
 
 # Aliases
+
+CloudKitty = Cloudkitty
diff --git a/diagrams/openstack/deployment.py b/diagrams/openstack/deployment.py
index 65692cac..fba5d4b3 100644
--- a/diagrams/openstack/deployment.py
+++ b/diagrams/openstack/deployment.py
@@ -33,3 +33,6 @@ class Tripleo(_Deployment):
 
 
 # Aliases
+
+KollaAnsible = Kolla
+TripleO = Tripleo
diff --git a/docs/nodes/openstack.md b/docs/nodes/openstack.md
index b95666e6..0d4c5059 100644
--- a/docs/nodes/openstack.md
+++ b/docs/nodes/openstack.md
@@ -10,7 +10,7 @@ Node classes list of openstack provider.
 
 ## openstack.apiproxies
 
-- **diagrams.openstack.apiproxies.Ec2Api**
+- **diagrams.openstack.apiproxies.EC2API**
 
 ## openstack.applicationlifecycle
 
@@ -26,7 +26,7 @@ Node classes list of openstack provider.
 
 ## openstack.billing
 
-- **diagrams.openstack.billing.Cloudkitty**
+- **diagrams.openstack.billing.Cloudkitty**, **CloudKitty** (alias)
 
 ## openstack.compute
 
@@ -44,8 +44,8 @@ Node classes list of openstack provider.
 - **diagrams.openstack.deployment.Charms**
 - **diagrams.openstack.deployment.Chef**
 - **diagrams.openstack.deployment.Helm**
-- **diagrams.openstack.deployment.Kolla**
-- **diagrams.openstack.deployment.Tripleo**
+- **diagrams.openstack.deployment.Kolla**, **KollaAnsible** (alias)
+- **diagrams.openstack.deployment.Tripleo**, **TripleO** (alias)
 
 ## openstack.frontend