diff --git a/hawkbit-repository/hawkbit-repository-ql/README.md b/hawkbit-repository/hawkbit-repository-jpa-ql/README.md
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/README.md
rename to hawkbit-repository/hawkbit-repository-jpa-ql/README.md
diff --git a/hawkbit-repository/hawkbit-repository-ql/pom.xml b/hawkbit-repository/hawkbit-repository-jpa-ql/pom.xml
similarity index 98%
rename from hawkbit-repository/hawkbit-repository-ql/pom.xml
rename to hawkbit-repository/hawkbit-repository-jpa-ql/pom.xml
index 064c0db49..f13df6b92 100644
--- a/hawkbit-repository/hawkbit-repository-ql/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-jpa-ql/pom.xml
@@ -18,7 +18,7 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>hawkbit-repository-ql</artifactId>
+    <artifactId>hawkbit-repository-jpa-ql</artifactId>
     <name>hawkBit :: Query Language</name>
 
     <profiles>
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/EntityMatcher.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/EntityMatcher.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/EntityMatcher.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/EntityMatcher.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/Node.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/Node.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/Node.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/Node.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/SpecificationBuilder.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/SpecificationBuilder.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/SpecificationBuilder.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/SpecificationBuilder.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HawkbitQlToSql.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HawkbitQlToSql.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HawkbitQlToSql.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HawkbitQlToSql.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/ql/utils/HibernateUtils.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlConfigHolder.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlConfigHolder.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlConfigHolder.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlConfigHolder.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParser.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParser.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParser.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParser.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlUtility.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlUtility.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlUtility.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlUtility.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/AbstractRSQLVisitor.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/AbstractRSQLVisitor.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/AbstractRSQLVisitor.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/AbstractRSQLVisitor.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitor.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitor.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitor.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitor.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitorG2.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitorG2.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitorG2.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/JpaQueryRsqlVisitorG2.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/SpecificationBuilderLegacy.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/SpecificationBuilderLegacy.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/SpecificationBuilderLegacy.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/legacy/SpecificationBuilderLegacy.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Root.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Root.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Root.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Root.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/RootRepository.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/RootRepository.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/RootRepository.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/RootRepository.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderLegacyTest.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderLegacyTest.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderLegacyTest.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderLegacyTest.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderTest.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderTest.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderTest.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SpecificationBuilderTest.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Sub.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Sub.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Sub.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/Sub.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubRepository.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubRepository.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubRepository.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubRepository.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSub.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSub.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSub.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSub.java
diff --git a/hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSubRepository.java b/hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSubRepository.java
similarity index 100%
rename from hawkbit-repository/hawkbit-repository-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSubRepository.java
rename to hawkbit-repository/hawkbit-repository-jpa-ql/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/sa/SubSubRepository.java
diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
index be70958c9..f975cdc11 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml
@@ -29,7 +29,7 @@
     <dependencies>
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
-            <artifactId>hawkbit-repository-ql</artifactId>
+            <artifactId>hawkbit-repository-jpa-ql</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/hawkbit-repository/pom.xml b/hawkbit-repository/pom.xml
index f3133ec69..38c1b264d 100644
--- a/hawkbit-repository/pom.xml
+++ b/hawkbit-repository/pom.xml
@@ -25,10 +25,10 @@
     <modules>
         <module>hawkbit-repository-api</module>
         <module>hawkbit-repository-core</module>
-        <module>hawkbit-repository-ql</module>
         <module>hawkbit-repository-jpa-api</module>
         <module>hawkbit-repository-jpa-eclipselink</module>
         <module>hawkbit-repository-jpa-hibernate</module>
+        <module>hawkbit-repository-jpa-ql</module>
         <module>hawkbit-repository-jpa</module>
         <module>hawkbit-repository-jpa-flyway</module>