diff --git a/gxqueueawssqs/pom.xml b/gxqueue-awssqs/pom.xml
similarity index 98%
rename from gxqueueawssqs/pom.xml
rename to gxqueue-awssqs/pom.xml
index 4c49c9c9d..738392321 100644
--- a/gxqueueawssqs/pom.xml
+++ b/gxqueue-awssqs/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>gxqueueawssqs</artifactId>
+    <artifactId>gxqueue-awssqs</artifactId>
     <name>GeneXus AWS SQS Queue</name>
     <dependencies>
         <dependency>
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java b/gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java
similarity index 100%
rename from gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java
rename to gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSBasicCredentials.java
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java b/gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java
similarity index 100%
rename from gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java
rename to gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSCredentials.java
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java b/gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java
similarity index 100%
rename from gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java
rename to gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueue.java
diff --git a/gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java b/gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java
similarity index 100%
rename from gxqueueawssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java
rename to gxqueue-awssqs/src/main/java/com/genexus/messaging/queue/aws/AWSQueueFactory.java
diff --git a/gxqueueawssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java b/gxqueue-awssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java
similarity index 100%
rename from gxqueueawssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java
rename to gxqueue-awssqs/src/main/java/com/genexusmessaging/awscore/SdtAWSBasicCredentials.java
diff --git a/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java b/gxqueue-awssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java
similarity index 100%
rename from gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java
rename to gxqueue-awssqs/src/test/java/com/genexus/messaging/queue/aws/TestAWSQueue.java
diff --git a/gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java b/gxqueue-awssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java
similarity index 100%
rename from gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java
rename to gxqueue-awssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java
diff --git a/gxqueueazure/pom.xml b/gxqueue-azure/pom.xml
similarity index 98%
rename from gxqueueazure/pom.xml
rename to gxqueue-azure/pom.xml
index aadf60d28..e7469ee7e 100644
--- a/gxqueueazure/pom.xml
+++ b/gxqueue-azure/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>gxqueueazure</artifactId>
+    <artifactId>gxqueue-azure</artifactId>
     <name>GeneXus Azure Storage Queue</name>
 
     <dependencies>
diff --git a/gxqueueazure/src/main/java/com/genexus/messaging/queue/azure/AzureQueueFactory.java b/gxqueue-azure/src/main/java/com/genexus/messaging/queue/azure/AzureQueueFactory.java
similarity index 100%
rename from gxqueueazure/src/main/java/com/genexus/messaging/queue/azure/AzureQueueFactory.java
rename to gxqueue-azure/src/main/java/com/genexus/messaging/queue/azure/AzureQueueFactory.java
diff --git a/pom.xml b/pom.xml
index 8d1a5cff8..d4a06d4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,8 +102,8 @@
 		<module>gxawsserverless</module>
 		<module>androidreports</module>
     <module>gxqueue</module>
-    <module>gxqueueawssqs</module>
-    <module>gxqueueazure</module>
+    <module>gxqueue-awssqs</module>
+    <module>gxqueue-azure</module>
     <module>gxcache-redis</module>
     <module>gxcache-memcached</module>
     <module>gxcloudstorage-common</module>