diff --git a/diagrams/ibm/compute.py b/diagrams/ibm/compute.py
index d932989d..7bff4f0d 100644
--- a/diagrams/ibm/compute.py
+++ b/diagrams/ibm/compute.py
@@ -8,24 +8,24 @@ class _Compute(_IBM):
     _icon_dir = "resources/ibm/compute"
 
 
-class Baremetalserver(_Compute):
-    _icon = "BareMetalServer.png"
+class BareMetalServer(_Compute):
+    _icon = "bare-metal-server.png"
 
 
-class Imageservice(_Compute):
-    _icon = "ImageService.png"
+class ImageService(_Compute):
+    _icon = "image-service.png"
 
 
 class Instance(_Compute):
-    _icon = "Instance.png"
+    _icon = "instance.png"
 
 
 class Key(_Compute):
-    _icon = "Key.png"
+    _icon = "key.png"
 
 
-class Powerinstance(_Compute):
-    _icon = "PowerInstance.png"
+class PowerInstance(_Compute):
+    _icon = "power-instance.png"
 
 
 # Aliases
diff --git a/diagrams/ibm/network.py b/diagrams/ibm/network.py
index bde8bf92..956d4cfa 100644
--- a/diagrams/ibm/network.py
+++ b/diagrams/ibm/network.py
@@ -9,87 +9,103 @@ class _Network(_IBM):
 
 
 class Bridge(_Network):
-    _icon = "Bridge.png"
+    _icon = "bridge.png"
 
 
-class Directlink(_Network):
-    _icon = "DirectLink.png"
+class DirectLink(_Network):
+    _icon = "direct-link.png"
 
 
 class Enterprise(_Network):
-    _icon = "Enterprise.png"
+    _icon = "enterprise.png"
 
 
 class Firewall(_Network):
-    _icon = "Firewall.png"
+    _icon = "firewall.png"
 
 
-class Floatingip(_Network):
-    _icon = "FloatingIP.png"
+class FloatingIp(_Network):
+    _icon = "floating-ip.png"
 
 
 class Gateway(_Network):
-    _icon = "Gateway.png"
+    _icon = "gateway.png"
 
 
-class Internetservices2(_Network):
-    _icon = "InternetServices2.png"
+class InternetServices(_Network):
+    _icon = "internet-services.png"
 
 
-class Loadbalancer(_Network):
-    _icon = "LoadBalancer.png"
+class LoadBalancerListener(_Network):
+    _icon = "load-balancer-listener.png"
 
 
-class Loadbalancerlistener(_Network):
-    _icon = "LoadBalancerListener.png"
+class LoadBalancerPool(_Network):
+    _icon = "load-balancer-pool.png"
 
 
-class Loadbalancerpool(_Network):
-    _icon = "LoadBalancerPool.png"
+class LoadBalancer(_Network):
+    _icon = "load-balancer.png"
 
 
-class Loadbalancingrouting(_Network):
-    _icon = "LoadBalancingRouting.png"
+class LoadBalancingRouting(_Network):
+    _icon = "load-balancing-routing.png"
 
 
-class Publicgateway(_Network):
-    _icon = "PublicGateway.png"
+class PublicGateway(_Network):
+    _icon = "public-gateway.png"
 
 
 class Region(_Network):
-    _icon = "Region.png"
+    _icon = "region.png"
 
 
 class Router(_Network):
-    _icon = "Router.png"
+    _icon = "router.png"
 
 
 class Rules(_Network):
-    _icon = "Rules.png"
+    _icon = "rules.png"
 
 
 class Subnet(_Network):
-    _icon = "Subnet.png"
+    _icon = "subnet.png"
 
 
-class Transitgateway(_Network):
-    _icon = "TransitGateway.png"
+class TransitGateway(_Network):
+    _icon = "transit-gateway.png"
 
 
 class Vpc(_Network):
-    _icon = "VPC.png"
+    _icon = "vpc.png"
 
 
-class Vpnconnection(_Network):
-    _icon = "VPNConnection.png"
+class VpnConnection(_Network):
+    _icon = "vpn-connection.png"
 
 
-class Vpngateway(_Network):
-    _icon = "VPNGateway.png"
+class VpnGateway(_Network):
+    _icon = "vpn-gateway.png"
 
 
-class Vpnpolicy(_Network):
-    _icon = "VPNPolicy.png"
+class VpnPolicy(_Network):
+    _icon = "vpn-policy.png"
 
 
 # Aliases
+
+ACL = Rules
+CIS = InternetServices
+DL = DirectLink
+FIP = FloatingIp
+FloatingIP = FloatingIp
+FW = Firewall
+LB = LoadBalancer
+NLB = LoadBalancer 
+PublicGateway = Gateway
+SecurityGroupRules = Rules
+TG = TransitGateway
+VPC = Vpc
+VPNGateway = VpnGateway
+VPNConnection = VpnConnection
+VPNPolicy = VpnPolicy
diff --git a/diagrams/ibm/storage.py b/diagrams/ibm/storage.py
index 95020938..b0f7e2a7 100644
--- a/diagrams/ibm/storage.py
+++ b/diagrams/ibm/storage.py
@@ -8,12 +8,12 @@ class _Storage(_IBM):
     _icon_dir = "resources/ibm/storage"
 
 
-class Blockstorage(_Storage):
-    _icon = "BlockStorage.png"
+class BlockStorage(_Storage):
+    _icon = "block-storage.png"
 
 
-class Objectstorage(_Storage):
-    _icon = "ObjectStorage.png"
+class ObjectStorage(_Storage):
+    _icon = "object-storage.png"
 
 
 # Aliases
diff --git a/docs/nodes/ibm.md b/docs/nodes/ibm.md
index caa8ea72..7e2a0b76 100644
--- a/docs/nodes/ibm.md
+++ b/docs/nodes/ibm.md
@@ -60,11 +60,11 @@ Node classes list of ibm provider.
 
 ## ibm.compute
 
-- **diagrams.ibm.compute.Baremetalserver**
-- **diagrams.ibm.compute.Imageservice**
+- **diagrams.ibm.compute.BareMetalServer**
+- **diagrams.ibm.compute.ImageService**
 - **diagrams.ibm.compute.Instance**
 - **diagrams.ibm.compute.Key**
-- **diagrams.ibm.compute.Powerinstance**
+- **diagrams.ibm.compute.PowerInstance**
 
 ## ibm.data
 
@@ -168,26 +168,26 @@ Node classes list of ibm provider.
 ## ibm.network
 
 - **diagrams.ibm.network.Bridge**
-- **diagrams.ibm.network.Directlink**
+- **diagrams.ibm.network.DirectLink**
 - **diagrams.ibm.network.Enterprise**
 - **diagrams.ibm.network.Firewall**
-- **diagrams.ibm.network.Floatingip**
+- **diagrams.ibm.network.FloatingIp**
 - **diagrams.ibm.network.Gateway**
-- **diagrams.ibm.network.Internetservices2**
-- **diagrams.ibm.network.Loadbalancer**
-- **diagrams.ibm.network.Loadbalancerlistener**
-- **diagrams.ibm.network.Loadbalancerpool**
-- **diagrams.ibm.network.Loadbalancingrouting**
-- **diagrams.ibm.network.Publicgateway**
+- **diagrams.ibm.network.InternetServices**
+- **diagrams.ibm.network.LoadBalancerListener**
+- **diagrams.ibm.network.LoadBalancerPool**
+- **diagrams.ibm.network.LoadBalancer**
+- **diagrams.ibm.network.LoadBalancingRouting**
+- **diagrams.ibm.network.PublicGateway**
 - **diagrams.ibm.network.Region**
 - **diagrams.ibm.network.Router**
 - **diagrams.ibm.network.Rules**
 - **diagrams.ibm.network.Subnet**
-- **diagrams.ibm.network.Transitgateway**
+- **diagrams.ibm.network.TransitGateway**
 - **diagrams.ibm.network.Vpc**
-- **diagrams.ibm.network.Vpnconnection**
-- **diagrams.ibm.network.Vpngateway**
-- **diagrams.ibm.network.Vpnpolicy**
+- **diagrams.ibm.network.VpnConnection**
+- **diagrams.ibm.network.VpnGateway**
+- **diagrams.ibm.network.VpnPolicy**
 
 ## ibm.security
 
@@ -216,8 +216,8 @@ Node classes list of ibm provider.
 
 ## ibm.storage
 
-- **diagrams.ibm.storage.Blockstorage**
-- **diagrams.ibm.storage.Objectstorage**
+- **diagrams.ibm.storage.BlockStorage**
+- **diagrams.ibm.storage.ObjectStorage**
 
 ## ibm.user