diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLQuery.java
similarity index 99%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLQuery.java
index 6c6f1ffaa..3d02d503b 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLQuery.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLSubQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLSubQuery.java
similarity index 98%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLSubQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLSubQuery.java
index 37c091591..00d544e8f 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/AbstractJDOQLSubQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/AbstractJDOQLSubQuery.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import java.util.Collection;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLCommonQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLCommonQuery.java
similarity index 92%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLCommonQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLCommonQuery.java
index d80ac71ce..47e0964bd 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLCommonQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLCommonQuery.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import com.mysema.query.Query;
 import com.mysema.query.types.EntityPath;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQuery.java
similarity index 97%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQuery.java
index b09bc2e2a..985677279 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQuery.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import javax.jdo.PersistenceManager;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQueryImpl.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java
similarity index 98%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQueryImpl.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java
index f4dd2434e..dec7f4fdd 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLQueryImpl.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLQueryImpl.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import javax.jdo.PersistenceManager;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSerializer.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
similarity index 99%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSerializer.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
index 74ad6f6b3..7bbe1f247 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSerializer.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSubQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSubQuery.java
similarity index 93%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSubQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSubQuery.java
index 736c44dd8..93b29d9bf 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLSubQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSubQuery.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import com.mysema.query.QueryMetadata;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLTemplates.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java
similarity index 97%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLTemplates.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java
index 70f90c002..c919169c3 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOQLTemplates.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLTemplates.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import com.mysema.query.types.JavaTemplates;
 import com.mysema.query.types.Ops;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOTuple.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOTuple.java
similarity index 97%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOTuple.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOTuple.java
index 95748d3db..d36f447e1 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/JDOTuple.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOTuple.java
@@ -1,4 +1,4 @@
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLDeleteClause.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java
similarity index 96%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLDeleteClause.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java
index e6a26d296..0d4bb5554 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLDeleteClause.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLDeleteClause.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql.dml;
+package com.mysema.query.jdo.dml;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,8 +16,8 @@ import com.mysema.query.DefaultQueryMetadata;
 import com.mysema.query.JoinType;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.dml.DeleteClause;
-import com.mysema.query.jdoql.JDOQLSerializer;
-import com.mysema.query.jdoql.JDOQLTemplates;
+import com.mysema.query.jdo.JDOQLSerializer;
+import com.mysema.query.jdo.JDOQLTemplates;
 import com.mysema.query.types.EntityPath;
 import com.mysema.query.types.Predicate;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLUpdateClause.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java
similarity index 98%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLUpdateClause.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java
index 42cdc4b12..227d70c48 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/JDOQLUpdateClause.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/JDOQLUpdateClause.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql.dml;
+package com.mysema.query.jdo.dml;
 
 import java.util.List;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/package-info.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/package-info.java
similarity index 87%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/package-info.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/package-info.java
index 6718eccdc..c8a73b2c7 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/dml/package-info.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/dml/package-info.java
@@ -8,7 +8,7 @@
  * DML operations support for Querydsl JDOQL
  */
 @DefaultAnnotation( { Nonnull.class })
-package com.mysema.query.jdoql.dml;
+package com.mysema.query.jdo.dml;
 
 import javax.annotation.Nonnull;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/package-info.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/package-info.java
similarity index 88%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/package-info.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/package-info.java
index a8882bc28..c59501eff 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/package-info.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/package-info.java
@@ -8,7 +8,7 @@
  * JDOQL support for Querydsl
  */
 @DefaultAnnotation( { Nonnull.class })
-package com.mysema.query.jdoql;
+package com.mysema.query.jdo;
 
 import javax.annotation.Nonnull;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/AbstractSQLQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
similarity index 98%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/AbstractSQLQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
index 408c699d6..8762c079e 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/AbstractSQLQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql.sql;
+package com.mysema.query.jdo.sql;
 
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.sql.ForeignKey;
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/JDOSQLQuery.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
similarity index 98%
rename from querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/JDOSQLQuery.java
rename to querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
index d013d2d8c..3004bdf3b 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdoql/sql/JDOSQLQuery.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/sql/JDOSQLQuery.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.jdoql.sql;
+package com.mysema.query.jdo.sql;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -26,7 +26,7 @@ import com.mysema.query.QueryException;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
-import com.mysema.query.jdoql.JDOTuple;
+import com.mysema.query.jdo.JDOTuple;
 import com.mysema.query.sql.SQLCommonQuery;
 import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;