diff --git a/bom/pom.xml b/bom/pom.xml
index cc71ed624..4f121814d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -34,11 +34,6 @@
                 <artifactId>system-x-amq</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>software.tnb</groupId>
-                <artifactId>system-x-aws</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
                 <artifactId>system-x-aws-cloudwatch</artifactId>
@@ -61,12 +56,12 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-aws-kinesis</artifactId>
+                <artifactId>system-x-aws-kinesis-firehose</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-aws-kinesis-firehose</artifactId>
+                <artifactId>system-x-aws-kinesis</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -101,7 +96,7 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-azure</artifactId>
+                <artifactId>system-x-aws</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -129,6 +124,11 @@
                 <artifactId>system-x-azure-storage-queue</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>software.tnb</groupId>
+                <artifactId>system-x-azure</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
                 <artifactId>system-x-cassandra</artifactId>
@@ -146,12 +146,12 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-db</artifactId>
+                <artifactId>system-x-db-common</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-db-common</artifactId>
+                <artifactId>system-x-db</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -174,11 +174,6 @@
                 <artifactId>system-x-ftp</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>software.tnb</groupId>
-                <artifactId>system-x-google-api</artifactId>
-                <version>1.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
                 <artifactId>system-x-google-api-common</artifactId>
@@ -186,7 +181,7 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-google</artifactId>
+                <artifactId>system-x-google-api</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -196,12 +191,12 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-google-cloud</artifactId>
+                <artifactId>system-x-google-cloud-common</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-google-cloud-common</artifactId>
+                <artifactId>system-x-google-cloud</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
@@ -229,6 +224,11 @@
                 <artifactId>system-x-google-storage</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>software.tnb</groupId>
+                <artifactId>system-x-google</artifactId>
+                <version>1.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
                 <artifactId>system-x-horreum</artifactId>
@@ -266,12 +266,12 @@
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-jms</artifactId>
+                <artifactId>system-x-jms-client</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>software.tnb</groupId>
-                <artifactId>system-x-jms-client</artifactId>
+                <artifactId>system-x-jms</artifactId>
                 <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>