diff --git a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
index 4c652fec4..2d4a453e4 100644
--- a/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/JpaRepository.java
@@ -22,7 +22,7 @@ import javax.persistence.EntityManager;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.CrudRepository;
 
 
 /**
diff --git a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
index a1b22564b..a88d6b8c2 100644
--- a/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
+++ b/src/main/java/org/springframework/data/jpa/repository/support/SimpleJpaRepository.java
@@ -37,13 +37,13 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.utils.JpaClassUtils;
-import org.springframework.data.repository.Repository;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.util.Assert;
 
 
 /**
- * Default implementation of the {@link Repository} interface. This will offer
+ * Default implementation of the {@link CrudRepository} interface. This will offer
  * you a more sophisticated interface than the plain {@link EntityManager} .
  * 
  * @author Oliver Gierke
diff --git a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericRepository.java b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericRepository.java
index 288d5a128..c5c0fc315 100644
--- a/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/custom/CustomGenericRepository.java
@@ -19,11 +19,11 @@ import java.io.Serializable;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.CrudRepository;
 
 
 /**
- * Extension of {@link Repository} to be added on a custom repository base
+ * Extension of {@link CrudRepository} to be added on a custom repository base
  * class. This tests the facility to implement custom base class functionality
  * for all repository instances derived from this interface and implementation
  * base class.
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 80d022502..a0ae429dc 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
@@ -16,7 +16,7 @@
 package org.springframework.data.jpa.repository.sample;
 
 import org.springframework.data.jpa.domain.sample.Role;
-import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.repository.CrudRepository;
 
 
 /**
@@ -24,6 +24,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
  * 
  * @author Oliver Gierke
  */
-public interface RoleRepository extends JpaRepository<Role, Integer> {
+public interface RoleRepository extends CrudRepository<Role, Integer> {
 
 }
diff --git a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
index e4708384a..e1ae11b78 100644
--- a/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
+++ b/src/test/java/org/springframework/data/jpa/repository/sample/UserRepository.java
@@ -30,7 +30,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.QueryHints;
-import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -56,7 +56,7 @@ public interface UserRepository extends JpaRepository<User, Integer>,
 
 
     /**
-     * Redeclaration of {@link Repository#findOne(java.io.Serializable)} to
+     * Redeclaration of {@link CrudRepository#findOne(java.io.Serializable)} to
      * change transaction configuration.
      */
     @Transactional