diff --git a/Spring Data JPA.sonargraph b/Spring Data JPA.sonargraph
index d41bcefa3..821ad1bee 100644
--- a/Spring Data JPA.sonargraph	
+++ b/Spring Data JPA.sonargraph	
@@ -108,7 +108,7 @@
         <architecture>
             <element type="Subsystem" name="Querydsl">
                 <element type="TypeFilter" name="Assignment">
-                    <element type="IncludeTypePattern" name="com.mysema.query.**"/>
+                    <element type="IncludeTypePattern" name="com.querydsl.**"/>
                 </element>
             </element>
             <element type="Subsystem" name="Spring">
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
index 015a37d15..98b64647b 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaPredicateExecutor.java
@@ -84,7 +84,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findOne(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
@@ -100,7 +100,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate) {
@@ -112,7 +112,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate, com.mysema.query.types.OrderSpecifier<?>[])
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier<?>[])
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
@@ -125,7 +125,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate, org.springframework.data.domain.Sort)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate, Sort sort) {
@@ -138,7 +138,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.OrderSpecifier[])
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
 	 */
 	@Override
 	public List<T> findAll(OrderSpecifier<?>... orders) {
@@ -166,7 +166,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public long count(Predicate predicate) {
@@ -175,7 +175,7 @@ public class QuerydslJpaPredicateExecutor<T> implements QuerydslPredicateExecuto
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public boolean exists(Predicate predicate) {
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java
index cb92df397..411345d98 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/QuerydslJpaRepository.java
@@ -53,6 +53,7 @@ import com.querydsl.jpa.impl.AbstractJPAQuery;
  * @author Jocelyn Ntakpe
  * @author Christoph Strobl
  * @author Jens Schauder
+ * @author Yanming Zhou
  */
 @Deprecated
 public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpaRepository<T, ID>
@@ -95,7 +96,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findOne(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
@@ -109,7 +110,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate) {
@@ -118,7 +119,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate, com.mysema.query.types.OrderSpecifier<?>[])
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier<?>[])
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
@@ -127,7 +128,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.Predicate, org.springframework.data.domain.Sort)
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
 	 */
 	@Override
 	public List<T> findAll(Predicate predicate, Sort sort) {
@@ -139,7 +140,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.mysema.query.types.OrderSpecifier[])
+	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
 	 */
 	@Override
 	public List<T> findAll(OrderSpecifier<?>... orders) {
@@ -166,7 +167,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#count(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public long count(Predicate predicate) {
@@ -175,7 +176,7 @@ public class QuerydslJpaRepository<T, ID extends Serializable> extends SimpleJpa
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	public boolean exists(Predicate predicate) {
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
index 24a3dd147..93f331956 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/RoleRepository.java
@@ -33,6 +33,7 @@ import com.querydsl.core.types.Predicate;
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
+ * @author Yanming Zhou
  */
 public interface RoleRepository extends CrudRepository<Role, Integer>, QuerydslPredicateExecutor<Role> {
 
@@ -56,7 +57,7 @@ public interface RoleRepository extends CrudRepository<Role, Integer>, QuerydslP
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.mysema.query.types.Predicate)
+	 * @see org.springframework.data.querydsl.QueryDslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
 	 */
 	@Override
 	@Lock(LockModeType.READ)