diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessor.java
index f3fb59d45..a5842e0ea 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessor.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessor.java
@@ -39,7 +39,7 @@ class RepositoryInterfaceAwareBeanPostProcessor extends
         InstantiationAwareBeanPostProcessorAdapter implements BeanFactoryAware {
 
     private static final Class<?> REPOSITORY_TYPE =
-            RepositoryFactorySupport.class;
+        RepositoryFactoryBeanSupport.class;
 
     private ConfigurableListableBeanFactory context;
 
@@ -76,7 +76,7 @@ class RepositoryInterfaceAwareBeanPostProcessor extends
 
         BeanDefinition definition = context.getBeanDefinition(beanName);
         PropertyValue value =
-                definition.getPropertyValues().getPropertyValue("daoInterface");
+            definition.getPropertyValues().getPropertyValue("repositoryInterface");
 
         return getClassForPropertyValue(value);
     }
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessorUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessorUnitTests.java
index 0108deedb..0ea87639d 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessorUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/support/RepositoryInterfaceAwareBeanPostProcessorUnitTests.java
@@ -40,9 +40,9 @@ import org.springframework.data.repository.Repository;
 public class RepositoryInterfaceAwareBeanPostProcessorUnitTests {
 
     private static final Class<?> FACTORY_CLASS =
-            RepositoryFactorySupport.class;
+        RepositoryFactoryBeanSupport.class;
     private static final String BEAN_NAME = "foo";
-    private static final String DAO_INTERFACE_PROPERTY = "daoInterface";
+    private static final String DAO_INTERFACE_PROPERTY = "repositoryInterface";
 
     private RepositoryInterfaceAwareBeanPostProcessor processor;