diff --git a/autogen.sh b/autogen.sh
index 407e2752..1e0804c4 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,7 +38,7 @@ for pvd in "${providers[@]}"; do
     python -m scripts.resource svg2png2 "$pvd"
   fi
   echo "cleaning the resource names for provider '$pvd'"
-  python -m scripts.resource clean "$pvd"
+  python3 -m scripts.resource clean "$pvd"
   # round the all png images for aws provider
   if [ "$pvd" = "aws" ]; then
     echo "rounding the resources for provider '$pvd'"
diff --git a/diagrams/oci/compute.py b/diagrams/oci/compute.py
index 57733f0e..dbe6bd91 100644
--- a/diagrams/oci/compute.py
+++ b/diagrams/oci/compute.py
@@ -8,11 +8,19 @@ class _Compute(_OCI):
     _icon_dir = "resources/oci/compute"
 
 
-class AutoScaleWhite(_Compute):
+class AutonomousWhite(_Compute):
+    _icon = "autonomous-white.png"
+
+
+class Autonomous(_Compute):
+    _icon = "autonomous.png"
+
+
+class AutoscaleWhite(_Compute):
     _icon = "autoscale-white.png"
 
 
-class AutoScale(_Compute):
+class Autoscale(_Compute):
     _icon = "autoscale.png"
 
 
@@ -32,6 +40,14 @@ class Container(_Compute):
     _icon = "container.png"
 
 
+class ContainerengineWhite(_Compute):
+    _icon = "containerengine-white.png"
+
+
+class Containerengine(_Compute):
+    _icon = "containerengine.png"
+
+
 class FunctionsWhite(_Compute):
     _icon = "functions-white.png"
 
@@ -40,28 +56,28 @@ class Functions(_Compute):
     _icon = "functions.png"
 
 
-class InstancePoolsWhite(_Compute):
-    _icon = "instancepools.png"
+class InstancepoolsWhite(_Compute):
+    _icon = "instancepools-white.png"
 
 
-class InstancePools(_Compute):
+class Instancepools(_Compute):
     _icon = "instancepools.png"
 
 
-class OCIRWhite(_Compute):
-    _icon = "ociregistry-white.png"
+class NatgatewayWhite(_Compute):
+    _icon = "natgateway-white.png"
 
 
-class OCIR(_Compute):
-    _icon = "ociregistry.png"
+class Natgateway(_Compute):
+    _icon = "natgateway.png"
 
 
-class OKEWhite(_Compute):
-    _icon = "containerengine-white.png"
+class OciregistryWhite(_Compute):
+    _icon = "ociregistry-white.png"
 
 
-class OKE(_Compute):
-    _icon = "containerengine.png"
+class Ociregistry(_Compute):
+    _icon = "ociregistry.png"
 
 
 class VmWhite(_Compute):
@@ -78,3 +94,7 @@ VirtualMachine = Vm
 VirtualMachineWhite = VmWhite
 BareMetal = Bm
 BareMetalWhite = BmWhite
+OCIRegistry = OCIR
+OCIRegistryWhite = OCIRWhite
+ContainerEngine = OKE
+ContainerEngineWhite = OKEWhite
diff --git a/diagrams/oci/database.py b/diagrams/oci/database.py
index fe99663b..c19d792f 100644
--- a/diagrams/oci/database.py
+++ b/diagrams/oci/database.py
@@ -8,14 +8,6 @@ class _Database(_OCI):
     _icon_dir = "resources/oci/database"
 
 
-class AutonomousDatabaseWhite(_Database):
-    _icon = "autonomous-white.png"
-
-
-class AutonomousDatabase(_Database):
-    _icon = "autonomous.png"
-
-
 class DatabaseserviceWhite(_Database):
     _icon = "databaseservice-white.png"
 
diff --git a/diagrams/oci/network.py b/diagrams/oci/network.py
index f48b169b..a145af51 100644
--- a/diagrams/oci/network.py
+++ b/diagrams/oci/network.py
@@ -40,14 +40,6 @@ class Loadbalance(_Network):
     _icon = "loadbalance.png"
 
 
-class NATgatewayWhite(_Network):
-    _icon = "natgateway-white.png"
-
-
-class NATgateway(_Network):
-    _icon = "natgateway.png"
-
-
 class RoutetableWhite(_Network):
     _icon = "routetable-white.png"
 
diff --git a/diagrams/oci/security.py b/diagrams/oci/security.py
index efe15718..7f766049 100644
--- a/diagrams/oci/security.py
+++ b/diagrams/oci/security.py
@@ -16,11 +16,11 @@ class Audit(_Security):
     _icon = "audit.png"
 
 
-class CloudGuardWhite(_Security):
+class CloudguardWhite(_Security):
     _icon = "cloudguard-white.png"
 
 
-class CloudGuard(_Security):
+class Cloudguard(_Security):
     _icon = "cloudguard.png"
 
 
diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py
index cd1d2998..5a9d159a 100644
--- a/diagrams/onprem/monitoring.py
+++ b/diagrams/onprem/monitoring.py
@@ -20,6 +20,34 @@ class Prometheus(_Monitoring):
     _icon = "prometheus.png"
 
 
+class RsaBlack(_Monitoring):
+    _icon = "rsa-black.png"
+
+
+class RsaEndpoint(_Monitoring):
+    _icon = "rsa-endpoint.png"
+
+
+class RsaLogs(_Monitoring):
+    _icon = "rsa-logs.png"
+
+
+class RsaNetwitness(_Monitoring):
+    _icon = "rsa-netwitness.png"
+
+
+class RsaPackets(_Monitoring):
+    _icon = "rsa-packets.png"
+
+
+class RsaPlatform(_Monitoring):
+    _icon = "rsa-platform.png"
+
+
+class RsaRed(_Monitoring):
+    _icon = "rsa-red.png"
+
+
 class Sentry(_Monitoring):
     _icon = "sentry.png"
 
diff --git a/docs/nodes/oci.md b/docs/nodes/oci.md
index f752cf82..aecafdf8 100644
--- a/docs/nodes/oci.md
+++ b/docs/nodes/oci.md
@@ -7,20 +7,24 @@ Node classes list of oci provider.
 
 ## oci.compute
 
-- **diagrams.oci.compute.AutoScaleWhite**
-- **diagrams.oci.compute.AutoScale**
+- **diagrams.oci.compute.AutonomousWhite**
+- **diagrams.oci.compute.Autonomous**
+- **diagrams.oci.compute.AutoscaleWhite**
+- **diagrams.oci.compute.Autoscale**
 - **diagrams.oci.compute.BmWhite**, **BareMetalWhite** (alias)
 - **diagrams.oci.compute.Bm**, **BareMetal** (alias)
 - **diagrams.oci.compute.ContainerWhite**
 - **diagrams.oci.compute.Container**
+- **diagrams.oci.compute.ContainerengineWhite**
+- **diagrams.oci.compute.Containerengine**
 - **diagrams.oci.compute.FunctionsWhite**
 - **diagrams.oci.compute.Functions**
-- **diagrams.oci.compute.InstancePoolsWhite**
-- **diagrams.oci.compute.InstancePools**
-- **diagrams.oci.compute.OCIRWhite**, **OCIRegistryWhite** (alias)
-- **diagrams.oci.compute.OCIR**, **OCIRegistry** (alias)
-- **diagrams.oci.compute.OKEWhite**, **ContainerEngineWhite** (aliass)
-- **diagrams.oci.compute.OKE**, **ContainerEngine** (alias)
+- **diagrams.oci.compute.InstancepoolsWhite**
+- **diagrams.oci.compute.Instancepools**
+- **diagrams.oci.compute.NatgatewayWhite**
+- **diagrams.oci.compute.Natgateway**
+- **diagrams.oci.compute.OciregistryWhite**
+- **diagrams.oci.compute.Ociregistry**
 - **diagrams.oci.compute.VmWhite**, **VirtualMachineWhite** (alias)
 - **diagrams.oci.compute.Vm**, **VirtualMachine** (alias)
 
@@ -39,8 +43,6 @@ Node classes list of oci provider.
 
 ## oci.database
 
-- **diagrams.oci.database.AutonomousDatabaseWhite**, **ADBWhite** (alias)
-- **diagrams.oci.database.AutonomousDatabase**, **ADB** (alias)
 - **diagrams.oci.database.DatabaseserviceWhite**, **DBServiceWhite** (alias)
 - **diagrams.oci.database.Databaseservice**, **DBService** (alias)
 
@@ -97,8 +99,6 @@ Node classes list of oci provider.
 - **diagrams.oci.network.Internetgateway**
 - **diagrams.oci.network.LoadbalanceWhite**
 - **diagrams.oci.network.Loadbalance**
-- **diagrams.oci.network.NATgatewayWhite**
-- **diagrams.oci.network.NATgateway**
 - **diagrams.oci.network.RoutetableWhite**
 - **diagrams.oci.network.Routetable**
 - **diagrams.oci.network.SecuritylistsWhite**
@@ -112,10 +112,10 @@ Node classes list of oci provider.
 
 - **diagrams.oci.security.AuditWhite**
 - **diagrams.oci.security.Audit**
+- **diagrams.oci.security.CloudguardWhite**
+- **diagrams.oci.security.Cloudguard**
 - **diagrams.oci.security.CompartmentsWhite**
 - **diagrams.oci.security.Compartments**
-- **diagrams.oci.security.CloudGuardWhite**
-- **diagrams.oci.security.CloudGuard**
 - **diagrams.oci.security.DdosWhite**
 - **diagrams.oci.security.Ddos**
 - **diagrams.oci.security.EncryptionWhite**
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index eac5bc34..e4fc9a0a 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -112,6 +112,13 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Datadog**
 - **diagrams.onprem.monitoring.Grafana**
 - **diagrams.onprem.monitoring.Prometheus**
+- **diagrams.onprem.monitoring.RsaBlack**
+- **diagrams.onprem.monitoring.RsaEndpoint**
+- **diagrams.onprem.monitoring.RsaLogs**
+- **diagrams.onprem.monitoring.RsaNetwitness**
+- **diagrams.onprem.monitoring.RsaPackets**
+- **diagrams.onprem.monitoring.RsaPlatform**
+- **diagrams.onprem.monitoring.RsaRed**
 - **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
 - **diagrams.onprem.monitoring.Thanos**
diff --git a/resources/onprem/monitoring/rsa_black.png b/resources/onprem/monitoring/rsa-black.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_black.png
rename to resources/onprem/monitoring/rsa-black.png
diff --git a/resources/onprem/monitoring/rsa_endpoint.png b/resources/onprem/monitoring/rsa-endpoint.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_endpoint.png
rename to resources/onprem/monitoring/rsa-endpoint.png
diff --git a/resources/onprem/monitoring/rsa_logs.png b/resources/onprem/monitoring/rsa-logs.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_logs.png
rename to resources/onprem/monitoring/rsa-logs.png
diff --git a/resources/onprem/monitoring/rsa_netwitness.png b/resources/onprem/monitoring/rsa-netwitness.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_netwitness.png
rename to resources/onprem/monitoring/rsa-netwitness.png
diff --git a/resources/onprem/monitoring/rsa_packets.png b/resources/onprem/monitoring/rsa-packets.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_packets.png
rename to resources/onprem/monitoring/rsa-packets.png
diff --git a/resources/onprem/monitoring/rsa_platform.png b/resources/onprem/monitoring/rsa-platform.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_platform.png
rename to resources/onprem/monitoring/rsa-platform.png
diff --git a/resources/onprem/monitoring/rsa_red.png b/resources/onprem/monitoring/rsa-red.png
similarity index 100%
rename from resources/onprem/monitoring/rsa_red.png
rename to resources/onprem/monitoring/rsa-red.png