diff --git a/querydsl-hibernate/etc/features.txt b/querydsl-hql/etc/features.txt
similarity index 100%
rename from querydsl-hibernate/etc/features.txt
rename to querydsl-hql/etc/features.txt
diff --git a/querydsl-hibernate/etc/precedence.txt b/querydsl-hql/etc/precedence.txt
similarity index 100%
rename from querydsl-hibernate/etc/precedence.txt
rename to querydsl-hql/etc/precedence.txt
diff --git a/querydsl-hibernate/pom.xml b/querydsl-hql/pom.xml
similarity index 100%
rename from querydsl-hibernate/pom.xml
rename to querydsl-hql/pom.xml
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlGrammar.java b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlGrammar.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlGrammar.java
rename to querydsl-hql/src/main/java/com/mysema/query/grammar/HqlGrammar.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlOps.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlOps.java
rename to querydsl-hql/src/main/java/com/mysema/query/grammar/HqlOps.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlQueryBase.java b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
rename to querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlSerializer.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/grammar/HqlSerializer.java
rename to querydsl-hql/src/main/java/com/mysema/query/grammar/HqlSerializer.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java b/querydsl-hql/src/main/java/com/mysema/query/hibernate/HqlQuery.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/hibernate/HqlQuery.java
rename to querydsl-hql/src/main/java/com/mysema/query/hibernate/HqlQuery.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/QueryModifiers.java b/querydsl-hql/src/main/java/com/mysema/query/hibernate/QueryModifiers.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/hibernate/QueryModifiers.java
rename to querydsl-hql/src/main/java/com/mysema/query/hibernate/QueryModifiers.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/QueryUtil.java b/querydsl-hql/src/main/java/com/mysema/query/hibernate/QueryUtil.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/hibernate/QueryUtil.java
rename to querydsl-hql/src/main/java/com/mysema/query/hibernate/QueryUtil.java
diff --git a/querydsl-hibernate/src/main/java/com/mysema/query/hibernate/SearchResults.java b/querydsl-hql/src/main/java/com/mysema/query/hibernate/SearchResults.java
similarity index 100%
rename from querydsl-hibernate/src/main/java/com/mysema/query/hibernate/SearchResults.java
rename to querydsl-hql/src/main/java/com/mysema/query/hibernate/SearchResults.java
diff --git a/querydsl-hibernate/src/test/includes/instances.txt b/querydsl-hql/src/test/includes/instances.txt
similarity index 100%
rename from querydsl-hibernate/src/test/includes/instances.txt
rename to querydsl-hql/src/test/includes/instances.txt
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/AllTests.java b/querydsl-hql/src/test/java/com/mysema/query/AllTests.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/AllTests.java
rename to querydsl-hql/src/test/java/com/mysema/query/AllTests.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlDomain.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlDomain.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlDomain.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlDomain.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlIntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlIntegrationTest.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlIntegrationTest.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlIntegrationTest.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/util/CustomNamingStrategy.java b/querydsl-hql/src/test/java/com/mysema/query/util/CustomNamingStrategy.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/util/CustomNamingStrategy.java
rename to querydsl-hql/src/test/java/com/mysema/query/util/CustomNamingStrategy.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/util/Hibernate.java b/querydsl-hql/src/test/java/com/mysema/query/util/Hibernate.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/util/Hibernate.java
rename to querydsl-hql/src/test/java/com/mysema/query/util/Hibernate.java
diff --git a/querydsl-hibernate/src/test/java/com/mysema/query/util/HibernateTestRunner.java b/querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java
similarity index 100%
rename from querydsl-hibernate/src/test/java/com/mysema/query/util/HibernateTestRunner.java
rename to querydsl-hql/src/test/java/com/mysema/query/util/HibernateTestRunner.java
diff --git a/querydsl-hibernate/src/test/resources/com/mysema/query/grammar/hql/default.properties b/querydsl-hql/src/test/resources/com/mysema/query/grammar/hql/default.properties
similarity index 100%
rename from querydsl-hibernate/src/test/resources/com/mysema/query/grammar/hql/default.properties
rename to querydsl-hql/src/test/resources/com/mysema/query/grammar/hql/default.properties
diff --git a/querydsl-hibernate/src/test/resources/log4j.properties b/querydsl-hql/src/test/resources/log4j.properties
similarity index 100%
rename from querydsl-hibernate/src/test/resources/log4j.properties
rename to querydsl-hql/src/test/resources/log4j.properties