diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java
index 88de5657f..c4af41252 100644
--- a/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java
+++ b/querydsl-collections/src/main/java/com/mysema/query/collections/DefaultEvaluatorFactory.java
@@ -32,9 +32,9 @@ import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.FactoryExpression;
 import com.mysema.query.types.Operation;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * DefaultEvaluatorFactory extends the EvaluatorFactory class to provide Java source
diff --git a/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java b/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java
index ab1736e2e..3b02d730b 100644
--- a/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java
+++ b/querydsl-collections/src/test/java/com/mysema/query/ColQueryStandardTest.java
@@ -21,11 +21,11 @@ import com.mysema.query.collections.Cat;
 import com.mysema.query.collections.MiniApi;
 import com.mysema.query.collections.QCat;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.expr.ArrayConstructorExpression;
 import com.mysema.query.types.expr.BooleanExpression;
 import com.mysema.query.types.expr.ConstructorExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.QTuple;
 
 public class ColQueryStandardTest {
diff --git a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
index a9db5e64d..84022b4e7 100644
--- a/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
+++ b/querydsl-core/src/main/java/com/mysema/query/DefaultQueryMetadata.java
@@ -19,9 +19,9 @@ import javax.annotation.Nullable;
 
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * DefaultQueryMetadata is the default implementation of the {@link QueryMetadata} interface
diff --git a/querydsl-core/src/main/java/com/mysema/query/Query.java b/querydsl-core/src/main/java/com/mysema/query/Query.java
index a6ccbf1d9..0ab33d86f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/Query.java
+++ b/querydsl-core/src/main/java/com/mysema/query/Query.java
@@ -9,8 +9,8 @@ import javax.annotation.Nonnegative;
 
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * Query provides a query interface of the fluent query DSL.
diff --git a/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java b/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java
index 04a651909..87907f5ff 100644
--- a/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java
+++ b/querydsl-core/src/main/java/com/mysema/query/QueryMetadata.java
@@ -14,8 +14,8 @@ import javax.annotation.Nullable;
 
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * QueryMetadata defines query metadata such as query sources, filtering
diff --git a/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java b/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java
index e5bb57f78..fa1108f35 100644
--- a/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java
+++ b/querydsl-core/src/main/java/com/mysema/query/SimpleQuery.java
@@ -8,8 +8,8 @@ package com.mysema.query;
 import javax.annotation.Nonnegative;
 
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * SimpleQuery defines a simple querying interface than {@link Query}
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java b/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
index 1cc0e4ac4..aeb2d20aa 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/QueryBase.java
@@ -8,8 +8,8 @@ package com.mysema.query.support;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * QueryBase provides a stub for Query implementations
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java b/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
index e29e9435b..6168fff6f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/QueryMixin.java
@@ -18,10 +18,10 @@ import com.mysema.query.types.Expression;
 import com.mysema.query.types.ExpressionUtils;
 import com.mysema.query.types.Ops;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.Predicate;
 import com.mysema.query.types.SubQueryExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.SimpleOperation;
 import com.mysema.query.types.path.MapPath;
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/support/SimpleQueryAdapter.java b/querydsl-core/src/main/java/com/mysema/query/support/SimpleQueryAdapter.java
index aa68bdd8a..2513bfebf 100644
--- a/querydsl-core/src/main/java/com/mysema/query/support/SimpleQueryAdapter.java
+++ b/querydsl-core/src/main/java/com/mysema/query/support/SimpleQueryAdapter.java
@@ -15,8 +15,8 @@ import com.mysema.query.SimpleProjectable;
 import com.mysema.query.SimpleQuery;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java
index 5ef8ecb64..72c64321f 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ExtractorVisitor.java
@@ -47,7 +47,7 @@ public final class ExtractorVisitor implements Visitor<Expression<?>,Void>{
     }
 
     @Override
-    public Expression<?> visit(Param<?> expr, Void context) {
+    public Expression<?> visit(ParamExpression<?> expr, Void context) {
         return expr;
     }
     
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java b/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java
new file mode 100644
index 000000000..3558209a1
--- /dev/null
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ParamExpression.java
@@ -0,0 +1,25 @@
+package com.mysema.query.types;
+
+/**
+ * @author tiwe
+ *
+ * @param <T>
+ */
+public interface ParamExpression<T> extends Expression<T>{
+    
+    /**
+     * @return
+     */
+    String getName();
+
+    /**
+     * @return
+     */
+    boolean isAnon();
+
+    /**
+     * @return
+     */
+    String getNotSetMessage();
+
+}
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java b/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java
index 5d52d89d5..ba8fe584b 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ParamNotSetException.java
@@ -5,6 +5,8 @@
  */
 package com.mysema.query.types;
 
+import com.mysema.query.types.expr.Param;
+
 /**
  * @author tiwe
  *
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java b/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java
index 76d8c007e..2ad2109d6 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/SerializerBase.java
@@ -151,7 +151,7 @@ public abstract class SerializerBase<S extends SerializerBase<S>> implements Vis
     }
 
     @Override
-    public Void visit(Param<?> param, Void context){
+    public Void visit(ParamExpression<?> param, Void context){
         String paramLabel;
         if (param.isAnon()){
             paramLabel = anonParamPrefix + param.getName();
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java b/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java
index 76b3ea646..dc28f9d99 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ToStringVisitor.java
@@ -101,7 +101,7 @@ public final class ToStringVisitor implements Visitor<String,Templates>{
     }
 
     @Override
-    public String visit(Param<?> param, Templates templates) {
+    public String visit(ParamExpression<?> param, Templates templates) {
         return "{" + param.getName() + "}";
     }
 
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java b/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java
index a7d36e642..2759bf379 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/Visitor.java
@@ -55,6 +55,6 @@ public interface Visitor<R,C>{
      * @param expr
      */
     @Nullable
-    R visit(Param<?> expr, @Nullable C context);
+    R visit(ParamExpression<?> expr, @Nullable C context);
 
 }
diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Param.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java
similarity index 88%
rename from querydsl-core/src/main/java/com/mysema/query/types/Param.java
rename to querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java
index 24b367844..c08e179c8 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/Param.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/Param.java
@@ -3,10 +3,11 @@
  * All rights reserved.
  *
  */
-package com.mysema.query.types;
+package com.mysema.query.types.expr;
 
 import com.mysema.commons.lang.Assert;
-import com.mysema.query.types.expr.SimpleExpression;
+import com.mysema.query.types.ParamExpression;
+import com.mysema.query.types.Visitor;
 
 /**
  * Param defines a parameter in a query with an optional name
@@ -15,7 +16,7 @@ import com.mysema.query.types.expr.SimpleExpression;
  *
  * @param <T>
  */
-public class Param<T> extends SimpleExpression<T> {
+public class Param<T> extends SimpleExpression<T> implements ParamExpression<T>{
 
     private static final long serialVersionUID = -6872502615009012503L;
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java b/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java
index e1865d8ef..52aec25a3 100644
--- a/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java
+++ b/querydsl-core/src/test/java/com/mysema/query/serialization/DummySerializer.java
@@ -6,7 +6,7 @@
 package com.mysema.query.serialization;
 
 import com.mysema.query.types.FactoryExpression;
-import com.mysema.query.types.Param;
+import com.mysema.query.types.ParamExpression;
 import com.mysema.query.types.SerializerBase;
 import com.mysema.query.types.SubQueryExpression;
 import com.mysema.query.types.Templates;
@@ -28,7 +28,7 @@ public class DummySerializer extends SerializerBase<DummySerializer>{
     }
 
     @Override
-    public Void visit(Param<?> expr, Void context) {
+    public Void visit(ParamExpression<?> expr, Void context) {
         return null;
     }
 
diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java
index fbcebe5bc..1dab6cc38 100644
--- a/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java
+++ b/querydsl-core/src/test/java/com/mysema/query/types/ParamTest.java
@@ -10,6 +10,8 @@ import static org.junit.Assert.assertFalse;
 
 import org.junit.Test;
 
+import com.mysema.query.types.expr.Param;
+
 public class ParamTest {
 
     Param<String> param11 = new Param<String>(String.class, "param1");
diff --git a/querydsl-hibernate-search/src/main/java/com/mysema/query/search/SearchQuery.java b/querydsl-hibernate-search/src/main/java/com/mysema/query/search/SearchQuery.java
index ba86121da..1dca08711 100644
--- a/querydsl-hibernate-search/src/main/java/com/mysema/query/search/SearchQuery.java
+++ b/querydsl-hibernate-search/src/main/java/com/mysema/query/search/SearchQuery.java
@@ -22,8 +22,8 @@ import com.mysema.query.lucene.LuceneSerializer;
 import com.mysema.query.support.QueryMixin;
 import com.mysema.query.types.EntityPath;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * SearchQuery is a Query implementation for Hibernate Search
diff --git a/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLSerializer.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
index af983c228..66b3e8ebf 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
@@ -259,7 +259,7 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
     }
 
     @Override
-    public Void visit(Param<?> param, Void context){
+    public Void visit(ParamExpression<?> param, Void context){
         append(":");
         super.visit(param, context);
         return null;
diff --git a/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java
index 074db89d8..292916050 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/hibernate/HibernateUtil.java
@@ -22,8 +22,8 @@ import org.hibernate.type.LongType;
 import org.hibernate.type.ShortType;
 import org.hibernate.type.Type;
 
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
+import com.mysema.query.types.expr.Param;
 
 /**
  * Utility methods for Hibernate
diff --git a/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
index 67ecb771c..4cbad63f0 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
@@ -9,8 +9,8 @@ import java.util.Map;
 
 import javax.persistence.Query;
 
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
+import com.mysema.query.types.expr.Param;
 
 /**
  * Utility methods for JPA
diff --git a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java
index f935c6c43..f3974d94c 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/AbstractStandardTest.java
@@ -28,12 +28,12 @@ import com.mysema.query.jpa.domain.Cat;
 import com.mysema.query.jpa.domain.DomesticCat;
 import com.mysema.query.jpa.domain.QCat;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.expr.ArrayConstructorExpression;
 import com.mysema.query.types.expr.BooleanExpression;
 import com.mysema.query.types.expr.ConstructorExpression;
 import com.mysema.query.types.expr.ListExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.QTuple;
 import com.mysema.query.types.expr.StringExpression;
 
diff --git a/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
index 7bbe1f247..66dc41459 100644
--- a/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
+++ b/querydsl-jdoql/src/main/java/com/mysema/query/jdo/JDOQLSerializer.java
@@ -20,6 +20,7 @@ import org.apache.commons.lang.ClassUtils;
 import com.mysema.query.JoinExpression;
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.*;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.SimpleOperation;
 import com.mysema.query.types.expr.StringConstant;
 
diff --git a/querydsl-jdoql/src/test/java/com/mysema/query/JDOQLQueryStandardTest.java b/querydsl-jdoql/src/test/java/com/mysema/query/JDOQLQueryStandardTest.java
index 36d703a84..5e66fffb4 100644
--- a/querydsl-jdoql/src/test/java/com/mysema/query/JDOQLQueryStandardTest.java
+++ b/querydsl-jdoql/src/test/java/com/mysema/query/JDOQLQueryStandardTest.java
@@ -28,11 +28,11 @@ import com.mysema.query.jdo.test.domain.QProduct;
 import com.mysema.query.jdo.test.domain.QStore;
 import com.mysema.query.jdo.test.domain.Store;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.expr.ArrayConstructorExpression;
 import com.mysema.query.types.expr.BooleanExpression;
 import com.mysema.query.types.expr.ConstructorExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.QTuple;
 
 public class JDOQLQueryStandardTest extends AbstractJDOTest {
diff --git a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java
index 2c5a0dda3..6ec4e0ade 100644
--- a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java
+++ b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneQuery.java
@@ -23,8 +23,8 @@ import com.mysema.query.SimpleProjectable;
 import com.mysema.query.SimpleQuery;
 import com.mysema.query.support.QueryMixin;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * LuceneQuery is a Querydsl query implementation for Lucene queries.
diff --git a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
index 2643914f2..f17277154 100644
--- a/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
+++ b/querydsl-lucene/src/main/java/com/mysema/query/lucene/LuceneSerializer.java
@@ -23,6 +23,7 @@ import org.apache.lucene.util.NumericUtils;
 
 import com.mysema.query.QueryMetadata;
 import com.mysema.query.types.*;
+import com.mysema.query.types.expr.Param;
 
 /**
  * Serializes Querydsl queries to Lucene queries.
diff --git a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
index 790c0c49b..79af1378d 100644
--- a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
+++ b/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneQueryTest.java
@@ -36,9 +36,9 @@ import org.junit.Test;
 import com.mysema.query.QueryException;
 import com.mysema.query.QueryModifiers;
 import com.mysema.query.SearchResults;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.PathMetadataFactory;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.path.EntityPathBase;
 import com.mysema.query.types.path.NumberPath;
 import com.mysema.query.types.path.StringPath;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
index 41f749c78..d7d311250 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/AbstractSQLQuery.java
@@ -39,12 +39,12 @@ import com.mysema.query.support.QueryMixin;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.FactoryExpression;
 import com.mysema.query.types.OrderSpecifier;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.Predicate;
 import com.mysema.query.types.SubQueryExpression;
 import com.mysema.query.types.custom.SimpleTemplate;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.QBean;
 import com.mysema.query.types.query.ListSubQuery;
 import com.mysema.util.ResultSetAdapter;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
index 89cd1d686..49f612a9e 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLSerializer.java
@@ -465,7 +465,7 @@ public class SQLSerializer extends SerializerBase<SQLSerializer> {
     }
 
     @Override
-    public Void visit(Param<?> param, Void context){
+    public Void visit(ParamExpression<?> param, Void context){
         append("?");
         constants.add(param);
         if (constantPaths.size() < constants.size()){
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java
index b9a7da2f0..c110af1db 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/AbstractSQLClause.java
@@ -11,9 +11,9 @@ import java.util.List;
 import java.util.Map;
 
 import com.mysema.query.sql.Configuration;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.Path;
+import com.mysema.query.types.expr.Param;
 
 /**
  * AbstractSQLClause is a superclass for SQL based DMLClause implementations
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java
index 739cc9b58..708559493 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLDeleteClause.java
@@ -26,8 +26,8 @@ import com.mysema.query.sql.Configuration;
 import com.mysema.query.sql.RelationalPath;
 import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 
 /**
  * SQLDeleteClause defines a DELETE clause
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
index c1ce2deda..7bbdef49a 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
@@ -34,9 +34,9 @@ import com.mysema.query.sql.RelationalPath;
 import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.SubQueryExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.SimpleConstant;
 import com.mysema.query.types.path.NullExpr;
 import com.mysema.util.ResultSetAdapter;
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
index 2822aaa90..55b6915d6 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
@@ -33,9 +33,9 @@ import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;
 import com.mysema.query.types.Expression;
 import com.mysema.query.types.ExpressionUtils;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.SubQueryExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.SimpleConstant;
 import com.mysema.query.types.path.NullExpr;
 
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java
index b751bcaf9..1964e98f6 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLUpdateClause.java
@@ -30,9 +30,9 @@ import com.mysema.query.sql.Configuration;
 import com.mysema.query.sql.RelationalPath;
 import com.mysema.query.sql.SQLSerializer;
 import com.mysema.query.sql.SQLTemplates;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.Predicate;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.path.NullExpr;
 
 /**
diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
index 766c2e155..9d38bfd57 100644
--- a/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
+++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBaseTest.java
@@ -44,7 +44,6 @@ import com.mysema.query.sql.domain.IdName;
 import com.mysema.query.sql.domain.QEmployee;
 import com.mysema.query.sql.domain.QIdName;
 import com.mysema.query.types.Expression;
-import com.mysema.query.types.Param;
 import com.mysema.query.types.ParamNotSetException;
 import com.mysema.query.types.Path;
 import com.mysema.query.types.SubQueryExpression;
@@ -53,6 +52,7 @@ import com.mysema.query.types.expr.ArrayConstructorExpression;
 import com.mysema.query.types.expr.BooleanExpression;
 import com.mysema.query.types.expr.ConstructorExpression;
 import com.mysema.query.types.expr.NumberExpression;
+import com.mysema.query.types.expr.Param;
 import com.mysema.query.types.expr.QTuple;
 import com.mysema.query.types.path.NumberPath;
 import com.mysema.query.types.path.PathBuilder;