diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java
similarity index 89%
rename from querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java
rename to querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java
index acbe66899..8c31df200 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/HibernateSQLSerializer.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java
@@ -15,17 +15,17 @@ import com.mysema.query.types.Constant;
 import com.mysema.query.types.Path;
 
 /**
- * HibernateSQLSerializer extends the SQLSerializer to extract referenced entity paths and change some
+ * NativeSQLSerializer extends the SQLSerializer to extract referenced entity paths and change some
  * serialization formats 
  * 
  * @author tiwe
  *
  */
-public final class HibernateSQLSerializer extends SQLSerializer{
+public final class NativeSQLSerializer extends SQLSerializer{
 
     private final List<Path<?>> entityPaths = new ArrayList<Path<?>>();
 
-    public HibernateSQLSerializer(SQLTemplates templates) {
+    public NativeSQLSerializer(SQLTemplates templates) {
         super(templates);
     }
 
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
index 00eb9fa53..61721a229 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java
@@ -24,7 +24,7 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
 import com.mysema.query.jpa.AbstractSQLQuery;
-import com.mysema.query.jpa.HibernateSQLSerializer;
+import com.mysema.query.jpa.NativeSQLSerializer;
 import com.mysema.query.jpa.hibernate.DefaultSessionHolder;
 import com.mysema.query.jpa.hibernate.FactoryExpressionTransformer;
 import com.mysema.query.jpa.hibernate.HibernateQuery;
@@ -84,7 +84,7 @@ public final class HibernateSQLQuery extends AbstractSQLQuery<HibernateSQLQuery>
         if (queryMixin.getMetadata().getJoins().isEmpty()) {
             throw new IllegalArgumentException("No joins given");
         }
-        HibernateSQLSerializer serializer = new HibernateSQLSerializer(sqlTemplates);
+        NativeSQLSerializer serializer = new NativeSQLSerializer(sqlTemplates);
         serializer.serialize(queryMixin.getMetadata(), forCountRow);
         constants = serializer.getConstantToLabel();
         entityPaths = serializer.getEntityPaths();
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
index 9544bc20b..65cb37ef6 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java
@@ -23,7 +23,7 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
 import com.mysema.query.jpa.AbstractSQLQuery;
-import com.mysema.query.jpa.HibernateSQLSerializer;
+import com.mysema.query.jpa.NativeSQLSerializer;
 import com.mysema.query.jpa.impl.DefaultSessionHolder;
 import com.mysema.query.jpa.impl.JPASessionHolder;
 import com.mysema.query.jpa.impl.JPAUtil;
@@ -67,7 +67,7 @@ public final class JPASQLQuery extends AbstractSQLQuery<JPASQLQuery> implements
         if (queryMixin.getMetadata().getJoins().isEmpty()) {
             throw new IllegalArgumentException("No joins given");
         }
-        HibernateSQLSerializer serializer = new HibernateSQLSerializer(sqlTemplates);
+        NativeSQLSerializer serializer = new NativeSQLSerializer(sqlTemplates);
         serializer.serialize(queryMixin.getMetadata(), forCountRow);
         constants = serializer.getConstantToLabel();
 //        entityPaths = serializer.getEntityPaths();
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateSQLSerializerTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java
similarity index 83%
rename from querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateSQLSerializerTest.java
rename to querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java
index 3c5922ad1..27394390d 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/HibernateSQLSerializerTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/NativeSQLSerializerTest.java
@@ -11,12 +11,12 @@ import com.mysema.query.jpa.domain.sql.SAnimal;
 import com.mysema.query.sql.MySQLTemplates;
 
 
-public class HibernateSQLSerializerTest {
+public class NativeSQLSerializerTest {
     
     @Test
     @Ignore
     public void In() {
-        HibernateSQLSerializer serializer = new HibernateSQLSerializer(new MySQLTemplates());
+        NativeSQLSerializer serializer = new NativeSQLSerializer(new MySQLTemplates());
         DefaultQueryMetadata md = new DefaultQueryMetadata();
         SAnimal cat = SAnimal.animal;
         md.addJoin(JoinType.DEFAULT, cat);