diff --git a/pom.xml b/pom.xml
index 8ac0ca0ee3..579134d8e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-commons</artifactId>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.DATACMNS-1161-SNAPSHOT</version>
 
 	<name>Spring Data Core</name>
 
diff --git a/src/main/java/org/springframework/data/mapping/PersistentProperty.java b/src/main/java/org/springframework/data/mapping/PersistentProperty.java
index 3d911a0fc9..78c7306702 100644
--- a/src/main/java/org/springframework/data/mapping/PersistentProperty.java
+++ b/src/main/java/org/springframework/data/mapping/PersistentProperty.java
@@ -30,6 +30,7 @@
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Jens Schauder
  */
 public interface PersistentProperty<P extends PersistentProperty<P>> {
 
@@ -66,10 +67,22 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
 	 * {@literal null} in case it refers to a simple type. Will return {@link Collection}'s component type or the
 	 * {@link Map}'s value type transparently.
 	 *
-	 * @return
+	 * @Deprecated Use getPersistentEntityTypes instead.
 	 */
+	@Deprecated
 	Iterable<? extends TypeInformation<?>> getPersistentEntityType();
 
+	/**
+	 * Returns the {@link TypeInformation} if the property references a {@link PersistentEntity}. Will return
+	 * {@literal null} in case it refers to a simple type. Will return {@link Collection}'s component type or the
+	 * {@link Map}'s value type transparently.
+	 *
+	 * @return
+	 */
+	default Iterable<? extends TypeInformation<?>> getPersistentEntityTypes() {
+		return getPersistentEntityType();
+	};
+
 	/**
 	 * Returns the getter method to access the property value if available. Might return {@literal null} in case there is
 	 * no getter method with a return type assignable to the actual property's type.
diff --git a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
index 569984c1c8..c1c83b9acc 100644
--- a/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
+++ b/src/main/java/org/springframework/data/mapping/context/AbstractMappingContext.java
@@ -554,7 +554,7 @@ private void createAndRegisterProperty(Property input) {
 				return;
 			}
 
-			property.getPersistentEntityType().forEach(AbstractMappingContext.this::addPersistentEntity);
+			property.getPersistentEntityTypes().forEach(AbstractMappingContext.this::addPersistentEntity);
 		}
 	}
 
diff --git a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
index 773efa2b63..35a096dac5 100644
--- a/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
+++ b/src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
@@ -133,6 +133,7 @@ public TypeInformation<?> getTypeInformation() {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mapping.PersistentProperty#getPersistentEntityType()
 	 */
+	@Deprecated
 	@Override
 	public Iterable<? extends TypeInformation<?>> getPersistentEntityType() {
 
diff --git a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java
index 9e4b817d35..68c5a026bb 100755
--- a/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java
+++ b/src/test/java/org/springframework/data/mapping/context/AbstractMappingContextIntegrationTests.java
@@ -113,7 +113,7 @@ protected T createPersistentProperty(Property property, BasicPersistentEntity<Ob
 
 			when(prop.getTypeInformation()).thenReturn(owner.getTypeInformation());
 			when(prop.getName()).thenReturn(property.getName());
-			when(prop.getPersistentEntityType()).thenReturn(Collections.EMPTY_SET);
+			when(prop.getPersistentEntityTypes()).thenReturn(Collections.EMPTY_SET);
 
 			try {
 				Thread.sleep(200);
diff --git a/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java b/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java
index a1c2866445..22c62c0e92 100755
--- a/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/model/AbstractPersistentPropertyUnitTests.java
@@ -44,6 +44,7 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Jens Schauder
  */
 public class AbstractPersistentPropertyUnitTests {
 
@@ -66,6 +67,7 @@ public void discoversComponentTypeCorrectly() throws Exception {
 
 	@Test // DATACMNS-101
 	public void returnsNestedEntityTypeCorrectly() {
+		assertThat(getProperty(TestClassComplex.class, "testClassSet").getPersistentEntityTypes()).isEmpty();
 		assertThat(getProperty(TestClassComplex.class, "testClassSet").getPersistentEntityType()).isEmpty();
 	}
 
@@ -189,6 +191,7 @@ public void considersCollectionPropertySimpleIfComponentTypeIsSimple() {
 	public void doesNotConsiderPropertyWithTreeMapMapValueAnEntity() {
 
 		SamplePersistentProperty property = getProperty(TreeMapWrapper.class, "map");
+		assertThat(property.getPersistentEntityTypes()).isEmpty();
 		assertThat(property.getPersistentEntityType()).isEmpty();
 		assertThat(property.isEntity()).isFalse();
 	}