diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
similarity index 89%
rename from hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java
rename to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
index 53753e46c1..05e7b57e44 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminatable.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/Discriminable.java
@@ -13,9 +13,9 @@ import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 
 /**
- * Things that have a discriminator associated with it.
+ * Anything that has a discriminator associated with it.
  */
-public interface Discriminatable {
+public interface Discriminable {
 	DiscriminatorMapping getDiscriminatorMapping();
 
 	/**
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
index d9edf48ecd..3e504dd2a0 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/DiscriminatedAssociationModelPart.java
@@ -6,7 +6,6 @@
  */
 package org.hibernate.metamodel.mapping;
 
-import org.hibernate.metamodel.mapping.internal.AnyDiscriminatorPart;
 import org.hibernate.sql.ast.tree.from.TableGroupJoinProducer;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.results.graph.Fetchable;
@@ -22,7 +21,7 @@ import org.hibernate.sql.results.graph.FetchableContainer;
  *
  * @author Steve Ebersole
  */
-public interface DiscriminatedAssociationModelPart extends Discriminatable, Fetchable, FetchableContainer, TableGroupJoinProducer {
+public interface DiscriminatedAssociationModelPart extends Discriminable, Fetchable, FetchableContainer, TableGroupJoinProducer {
 	/**
 	 * @deprecated Use {@link #getDiscriminatorMapping} instead.
 	 */
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
index db305ff9c5..0e775acdba 100644
--- a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
+++ b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/EntityMappingType.java
@@ -56,7 +56,7 @@ import static org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer.UNFETCH
  * @author Steve Ebersole
  */
 public interface EntityMappingType
-		extends ManagedMappingType, EntityValuedModelPart, Loadable, Restrictable, Discriminatable {
+		extends ManagedMappingType, EntityValuedModelPart, Loadable, Restrictable, Discriminable {
 
 	/**
 	 * The entity name.