diff --git a/src/main/java/org/springframework/data/mapping/PersistentProperty.java b/src/main/java/org/springframework/data/mapping/PersistentProperty.java
index 3d911a0fc..78c730670 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 @@ import org.springframework.lang.Nullable;
  * @author Jon Brisbin
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Jens Schauder
  */
 public interface PersistentProperty<P extends PersistentProperty<P>> {
 
@@ -61,6 +62,16 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
 	 */
 	TypeInformation<?> getTypeInformation();
 
+	/**
+	 * 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.
+	 *
+	 * @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
@@ -68,7 +79,9 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
 	 *
 	 * @return
 	 */
-	Iterable<? extends TypeInformation<?>> getPersistentEntityType();
+	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
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 569984c1c..c1c83b9ac 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 @@ public abstract class AbstractMappingContext<E extends MutablePersistentEntity<?
 				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 773efa2b6..35a096dac 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 abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
 	 * (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 9e4b817d3..68c5a026b 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 @@ public class AbstractMappingContextIntegrationTests<T extends PersistentProperty
 
 			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 a1c286644..22c62c0e9 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 @@ import org.springframework.util.ReflectionUtils;
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Jens Schauder
  */
 public class AbstractPersistentPropertyUnitTests {
 
@@ -66,6 +67,7 @@ public class AbstractPersistentPropertyUnitTests {
 
 	@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 class AbstractPersistentPropertyUnitTests {
 	public void doesNotConsiderPropertyWithTreeMapMapValueAnEntity() {
 
 		SamplePersistentProperty property = getProperty(TreeMapWrapper.class, "map");
+		assertThat(property.getPersistentEntityTypes()).isEmpty();
 		assertThat(property.getPersistentEntityType()).isEmpty();
 		assertThat(property.isEntity()).isFalse();
 	}