rename RelationshipReference to Relationship

73 files changed, 643 insertions, 643 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaFactory.java
index 70f4e581b7..260ab51584 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.UniqueConstraint;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaOverrideRelationship;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
 import org.eclipse.jpt.core.context.java.JavaAttributeOverride;
 import org.eclipse.jpt.core.context.java.JavaAttributeOverrideContainer;
@@ -70,7 +70,7 @@ import org.eclipse.jpt.core.context.java.JavaTypeMapping;
 import org.eclipse.jpt.core.context.java.JavaUniqueConstraint;
 import org.eclipse.jpt.core.context.java.JavaVersionMapping;
 import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualOverrideRelationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualAttributeOverride;
 import org.eclipse.jpt.core.context.java.JavaVirtualColumn;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumn;
@@ -88,7 +88,7 @@ import org.eclipse.jpt.core.internal.jpa1.GenericJpaProject;
 import org.eclipse.jpt.core.internal.jpa1.context.GenericRootContextNode;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaAssociationOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaAssociationOverrideContainer;
-import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaOverrideRelationship;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaAttributeOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaAttributeOverrideContainer;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaBasicMapping;
@@ -128,7 +128,7 @@ import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaTransientMappi
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaUniqueConstraint;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVersionMapping;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualAssociationOverride;
-import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualOverrideRelationship;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualAttributeOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualColumn;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaVirtualJoinColumn;
@@ -352,12 +352,12 @@ public abstract class AbstractJpaFactory
 		return new GenericJavaVirtualAssociationOverride(parent, name);
 	}
 	
-	public JavaAssociationOverrideRelationshipReference buildJavaAssociationOverrideRelationshipReference(JavaAssociationOverride parent) {
-		return new GenericJavaAssociationOverrideRelationshipReference(parent);
+	public JavaOverrideRelationship buildJavaOverrideRelationship(JavaAssociationOverride parent) {
+		return new GenericJavaOverrideRelationship(parent);
 	}
 	
-	public JavaVirtualAssociationOverrideRelationshipReference buildJavaVirtualAssociationOverrideRelationshipReference(JavaVirtualAssociationOverride parent) {
-		return new GenericJavaVirtualAssociationOverrideRelationshipReference(parent);
+	public JavaVirtualOverrideRelationship buildJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent) {
+		return new GenericJavaVirtualOverrideRelationship(parent);
 	}
 	
 	public JavaQueryContainer buildJavaQueryContainer(JavaJpaContextNode parent, JavaQueryContainer.Owner owner) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
index 4e0a4dfb14..db474d072b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -21,10 +21,10 @@ import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.ReadOnlyAttributeOverride;
 import org.eclipse.jpt.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyPersistentAttribute;
-import org.eclipse.jpt.core.context.ReadOnlyRelationshipReference;
+import org.eclipse.jpt.core.context.ReadOnlyRelationship;
 import org.eclipse.jpt.core.context.ReferenceTable;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.jpa2.context.AttributeMapping2_0;
 import org.eclipse.jpt.core.jpa2.context.CollectionMapping2_0;
@@ -62,16 +62,16 @@ public final class MappingTools {
 	 * database connection. We need the database to convert the resulting name
 	 * to an identifier appropriate to the current database.
 	 */
-	public static String buildJoinTableDefaultName(ReadOnlyRelationshipReference relationshipReference) {
-		if (relationshipReference.getJpaProject().getDataSource().connectionProfileIsActive()) {
-			return buildDbJoinTableDefaultName(relationshipReference);
+	public static String buildJoinTableDefaultName(ReadOnlyRelationship relationship) {
+		if (relationship.getJpaProject().getDataSource().connectionProfileIsActive()) {
+			return buildDbJoinTableDefaultName(relationship);
 		}
 		// continue with a "best effort":
-		String owningTableName = relationshipReference.getTypeMapping().getPrimaryTableName();
+		String owningTableName = relationship.getTypeMapping().getPrimaryTableName();
 		if (owningTableName == null) {
 			return null;
 		}
-		RelationshipMapping relationshipMapping = relationshipReference.getMapping();
+		RelationshipMapping relationshipMapping = relationship.getMapping();
 		if (relationshipMapping == null) {
 			return null;
 		}
@@ -89,12 +89,12 @@ public final class MappingTools {
 	/**
 	 * Use the database to build a more accurate default name.
 	 */
-	private static String buildDbJoinTableDefaultName(ReadOnlyRelationshipReference relationshipReference) {
-		Table owningTable = relationshipReference.getTypeMapping().getPrimaryDbTable();
+	private static String buildDbJoinTableDefaultName(ReadOnlyRelationship relationship) {
+		Table owningTable = relationship.getTypeMapping().getPrimaryDbTable();
 		if (owningTable == null) {
 			return null;
 		}
-		RelationshipMapping relationshipMapping = relationshipReference.getMapping();
+		RelationshipMapping relationshipMapping = relationship.getMapping();
 		if (relationshipMapping == null) {
 			return null;
 		}
@@ -136,7 +136,7 @@ public final class MappingTools {
 	 * OneToMany or ManyToMany) is
 	 *     [target entity name]_[referenced column name]
 	 *
-	 * @see #buildJoinTableDefaultName(ReadOnlyRelationshipReference)
+	 * @see #buildJoinTableDefaultName(ReadOnlyRelationship)
 	 */
 	public static String buildJoinColumnDefaultName(ReadOnlyJoinColumn joinColumn, ReadOnlyJoinColumn.Owner owner) {
 		if (owner.joinColumnsSize() != 1) {
@@ -294,14 +294,14 @@ public final class MappingTools {
 	}
 
 	// TODO move to TypeMapping? may need different name (or may need to rename existing #resolve...)
-	public static RelationshipReference resolveOverriddenRelationship(TypeMapping overridableTypeMapping, String attributeName) {
+	public static Relationship resolveOverriddenRelationship(TypeMapping overridableTypeMapping, String attributeName) {
 		// convenience null check to simplify client code
 		if (overridableTypeMapping == null) {
 			return null;
 		}
 
 		for (TypeMapping typeMapping : CollectionTools.iterable(overridableTypeMapping.inheritanceHierarchy())) {
-			RelationshipReference relationship = typeMapping.resolveOverriddenRelationship(attributeName);
+			Relationship relationship = typeMapping.resolveOverriddenRelationship(attributeName);
 			if (relationship != null) {
 				return relationship;
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java
index c705c05174..072bbf50c6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.context.AttributeMapping;
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.ColumnMapping;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
@@ -215,9 +215,9 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation>
 		return ((mapping != null) && mapping.isOverridableAttributeMapping()) ? (ColumnMapping) mapping : null;
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		RelationshipMapping mapping = this.resolveRelationshipMapping(attributeName);
-		return (mapping == null) ? null : mapping.getRelationshipReference();
+		return (mapping == null) ? null : mapping.getRelationship();
 	}
 
 	protected RelationshipMapping resolveRelationshipMapping(String name) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaEntity.java
index bec3be9cf9..b1912507a2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaEntity.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -41,7 +41,7 @@ import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyTable;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.SecondaryTable;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
@@ -971,10 +971,10 @@ public abstract class AbstractJavaEntity
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		// check for an override before looking at attribute mappings
 		AssociationOverride override = this.associationOverrideContainer.getSpecifiedOverrideNamed(attributeName);
-		return (override != null) ? override.getRelationshipReference() : super.resolveOverriddenRelationship(attributeName);
+		return (override != null) ? override.getRelationship() : super.resolveOverriddenRelationship(attributeName);
 	}
 
 
@@ -1670,7 +1670,7 @@ public abstract class AbstractJavaEntity
 			return typeMapping.allOverridableAssociationNames();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinColumnJoiningStrategy.java
index c6eb8db376..b0a6ccf010 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,7 +20,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaJoinColumnRelationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
@@ -46,7 +46,7 @@ public abstract class AbstractJavaJoinColumnJoiningStrategy
 	protected JavaJoinColumn defaultJoinColumn;
 
 
-	protected AbstractJavaJoinColumnJoiningStrategy(JavaJoinColumnEnabledRelationshipReference parent) {
+	protected AbstractJavaJoinColumnJoiningStrategy(JavaJoinColumnRelationship parent) {
 		super(parent);
 		this.specifiedJoinColumnContainerAdapter = this.buildSpecifiedJoinColumnContainerAdapter();
 		this.joinColumnOwner = this.buildJoinColumnOwner();
@@ -231,7 +231,7 @@ public abstract class AbstractJavaJoinColumnJoiningStrategy
 
 	protected boolean buildsDefaultJoinColumn() {
 		return ! this.hasSpecifiedJoinColumns() &&
-				this.getRelationshipReference().mayHaveDefaultJoinColumn();
+				this.getRelationship().mayHaveDefaultJoinColumn();
 	}
 
 
@@ -251,11 +251,11 @@ public abstract class AbstractJavaJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaJoinColumnEnabledRelationshipReference getParent() {
-		return (JavaJoinColumnEnabledRelationshipReference) super.getParent();
+	public JavaJoinColumnRelationship getParent() {
+		return (JavaJoinColumnRelationship) super.getParent();
 	}
 
-	public JavaJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public JavaJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
@@ -276,7 +276,7 @@ public abstract class AbstractJavaJoinColumnJoiningStrategy
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public String getTableName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinTableJoiningStrategy.java
index 5eb653ca58..13e05d0a04 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaJoinTableRelationship;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.core.internal.validation.JpaValidationDescriptionMessages;
@@ -34,7 +34,7 @@ public abstract class AbstractJavaJoinTableJoiningStrategy
 	protected JavaJoinTable joinTable;
 
 
-	protected AbstractJavaJoinTableJoiningStrategy(JavaJoinTableEnabledRelationshipReference parent) {
+	protected AbstractJavaJoinTableJoiningStrategy(JavaJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -88,7 +88,7 @@ public abstract class AbstractJavaJoinTableJoiningStrategy
 	 */
 	protected boolean buildsJoinTable() {
 		return this.getJoinTableAnnotation().isSpecified()
-			|| this.getRelationshipReference().mayHaveDefaultJoinTable();
+			|| this.getRelationship().mayHaveDefaultJoinTable();
 	}
 
 	protected JavaJoinTable buildJoinTable() {
@@ -106,16 +106,16 @@ public abstract class AbstractJavaJoinTableJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaJoinTableEnabledRelationshipReference getParent() {
-		return (JavaJoinTableEnabledRelationshipReference) super.getParent();
+	public JavaJoinTableRelationship getParent() {
+		return (JavaJoinTableRelationship) super.getParent();
 	}
 
-	public JavaJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public JavaJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public void initializeFrom(ReadOnlyJoinTableJoiningStrategy oldStrategy) {
@@ -151,7 +151,7 @@ public abstract class AbstractJavaJoinTableJoiningStrategy
 	}
 
 	public String getJoinTableDefaultName() {
-		return MappingTools.buildJoinTableDefaultName(this.getRelationshipReference());
+		return MappingTools.buildJoinTableDefaultName(this.getRelationship());
 	}
 
 	public void addStrategy() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToManyMapping.java
index f2c8b12114..4524b085c6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToManyMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.core.internal.context.java;
 
 import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaManyToManyRelationshipReference;
-import org.eclipse.jpt.core.context.java.JavaMappingRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaManyToManyRelationship;
+import org.eclipse.jpt.core.context.java.JavaMappingRelationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.jpa2.context.java.JavaManyToManyMapping2_0;
 import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation;
@@ -28,13 +28,13 @@ public abstract class AbstractJavaManyToManyMapping
 	// ********** relationship **********
 
 	@Override
-	public JavaManyToManyRelationshipReference getRelationshipReference() {
-		return (JavaManyToManyRelationshipReference) super.getRelationshipReference();
+	public JavaManyToManyRelationship getRelationship() {
+		return (JavaManyToManyRelationship) super.getRelationship();
 	}
 
 	@Override
-	protected JavaMappingRelationshipReference buildRelationshipReference() {
-		return new GenericJavaManyToManyRelationshipReference(this);
+	protected JavaMappingRelationship buildRelationship() {
+		return new GenericJavaManyToManyRelationship(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToOneMapping.java
index a26455f1b6..128f3baca3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaManyToOneMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.core.internal.context.java;
 
 import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaManyToOneRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaManyToOneRelationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneMapping2_0;
 import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation;
@@ -27,13 +27,13 @@ public abstract class AbstractJavaManyToOneMapping
 	// ********** relationship **********
 
 	@Override
-	public JavaManyToOneRelationshipReference getRelationshipReference() {
-		return (JavaManyToOneRelationshipReference) super.getRelationshipReference();
+	public JavaManyToOneRelationship getRelationship() {
+		return (JavaManyToOneRelationship) super.getRelationship();
 	}
 
 	@Override
-	protected JavaManyToOneRelationshipReference buildRelationshipReference() {
-		return new GenericJavaManyToOneRelationshipReference(this);
+	protected JavaManyToOneRelationship buildRelationship() {
+		return new GenericJavaManyToOneRelationship(this);
 	}	
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMappingRelationship.java
index e026093b14..d38cb4e724 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMappingRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMappingRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,13 +12,13 @@ package org.eclipse.jpt.core.internal.context.java;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.JoiningStrategy;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyRelationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
-import org.eclipse.jpt.core.context.java.JavaMappingRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaMappingRelationship;
 import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
 import org.eclipse.jpt.core.utility.TextRange;
 
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
  */
 public abstract class AbstractJavaMappingRelationship<M extends JavaRelationshipMapping>
 	extends AbstractJavaJpaContextNode
-	implements JavaMappingRelationshipReference
+	implements JavaMappingRelationship
 {
 	protected JavaJoiningStrategy strategy;
 
@@ -73,19 +73,19 @@ public abstract class AbstractJavaMappingRelationship<M extends JavaRelationship
 
 	// ********** conversions **********
 
-	public void initializeFrom(ReadOnlyRelationshipReference oldRelationship) {
+	public void initializeFrom(ReadOnlyRelationship oldRelationship) {
 		oldRelationship.initializeOn(this);
 	}
 
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		// NOP
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
index 6fb329f853..df12676447 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -165,7 +165,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 			return this.getJoinStrategy().resolveDbTable(tableName);
 		}
 		protected JavaJoiningStrategy getJoinStrategy() {
-			return AbstractJavaMultiRelationshipMapping.this.getRelationshipReference().getPredominantJoiningStrategy();
+			return AbstractJavaMultiRelationshipMapping.this.getRelationship().getPredominantJoiningStrategy();
 		}
 	}
 
@@ -690,7 +690,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 		}
 
 		protected JoiningStrategy getJoinStrategy() {
-			return AbstractJavaMultiRelationshipMapping.this.getRelationshipReference().getPredominantJoiningStrategy();
+			return AbstractJavaMultiRelationshipMapping.this.getRelationship().getPredominantJoiningStrategy();
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToManyMapping.java
index 3d09d50c47..9499b97f81 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToManyMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.core.internal.context.java;
 
 import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaMappingRelationshipReference;
-import org.eclipse.jpt.core.context.java.JavaOneToManyRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaMappingRelationship;
+import org.eclipse.jpt.core.context.java.JavaOneToManyRelationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0;
 import org.eclipse.jpt.core.jpa2.context.java.JavaOneToManyMapping2_0;
@@ -50,12 +50,12 @@ public abstract class AbstractJavaOneToManyMapping
 	// ********** relationship **********
 
 	@Override
-	public JavaOneToManyRelationshipReference getRelationshipReference() {
-		return (JavaOneToManyRelationshipReference) super.getRelationshipReference();
+	public JavaOneToManyRelationship getRelationship() {
+		return (JavaOneToManyRelationship) super.getRelationship();
 	}
 
 	@Override
-	protected JavaMappingRelationshipReference buildRelationshipReference() {
+	protected JavaMappingRelationship buildRelationship() {
 		return new GenericJavaOneToManyRelationship(this, this.isJpa2_0Compatible());
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToOneMapping.java
index 6e0201e1f7..d6a6a188e6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOneToOneMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.core.internal.context.java;
 
 import org.eclipse.jpt.core.MappingKeys;
-import org.eclipse.jpt.core.context.java.JavaOneToOneRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaOneToOneRelationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0;
 import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneMapping2_0;
@@ -50,13 +50,13 @@ public abstract class AbstractJavaOneToOneMapping
 	// ********** relationship **********
 
 	@Override
-	public JavaOneToOneRelationshipReference getRelationshipReference() {
-		return (JavaOneToOneRelationshipReference) super.getRelationshipReference();
+	public JavaOneToOneRelationship getRelationship() {
+		return (JavaOneToOneRelationship) super.getRelationship();
 	}
 
 	@Override
-	protected JavaOneToOneRelationshipReference buildRelationshipReference() {
-		return new GenericJavaOneToOneRelationshipReference(this);
+	protected JavaOneToOneRelationship buildRelationship() {
+		return new GenericJavaOneToOneRelationship(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java
index 921e3c3e84..126228f19e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,7 +20,7 @@ import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.java.JavaCascade;
-import org.eclipse.jpt.core.context.java.JavaMappingRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaMappingRelationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
 import org.eclipse.jpt.core.internal.context.AttributeMappingTools;
@@ -49,7 +49,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 	protected String defaultTargetEntity;
 	protected String fullyQualifiedTargetEntity;
 
-	protected final JavaMappingRelationshipReference relationshipReference;
+	protected final JavaMappingRelationship relationship;
 
 	protected final JavaCascade cascade;
 
@@ -60,7 +60,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 	protected AbstractJavaRelationshipMapping(JavaPersistentAttribute parent) {
 		super(parent);
 		this.specifiedTargetEntity = this.buildSpecifiedTargetEntity();
-		this.relationshipReference = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 		this.cascade = this.buildCascade();
 		this.specifiedFetch = this.buildSpecifiedFetch();
 	}
@@ -72,7 +72,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 	public void synchronizeWithResourceModel() {
 		super.synchronizeWithResourceModel();
 		this.setSpecifiedTargetEntity_(this.buildSpecifiedTargetEntity());
-		this.relationshipReference.synchronizeWithResourceModel();
+		this.relationship.synchronizeWithResourceModel();
 		this.cascade.synchronizeWithResourceModel();
 		this.setSpecifiedFetch_(this.buildSpecifiedFetch());
 	}
@@ -82,7 +82,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 		super.update();
 		this.setDefaultTargetEntity(this.buildDefaultTargetEntity());
 		this.setFullyQualifiedTargetEntity(this.buildFullyQualifiedTargetEntity());
-		this.relationshipReference.update();
+		this.relationship.update();
 		this.cascade.update();
 		this.setDefaultFetch(this.buildDefaultFetch());
 	}
@@ -160,11 +160,11 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 
 	// ********** relationship reference **********
 
-	public JavaMappingRelationshipReference getRelationshipReference() {
-		return this.relationshipReference;
+	public JavaMappingRelationship getRelationship() {
+		return this.relationship;
 	}
 
-	protected abstract JavaMappingRelationshipReference buildRelationshipReference();
+	protected abstract JavaMappingRelationship buildRelationship();
 
 
 	// ********** cascade **********
@@ -224,13 +224,13 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 
 	@Override
 	public boolean isRelationshipOwner() {
-		return this.relationshipReference.isOwner();
+		return this.relationship.isOwner();
 	}
 
 	@Override
 	public boolean isOwnedBy(AttributeMapping mapping) {
 		return mapping.isRelationshipOwner() &&
-			this.relationshipReference.isOwnedBy((RelationshipMapping) mapping);
+			this.relationship.isOwnedBy((RelationshipMapping) mapping);
 	}
 
 	public RelationshipMapping getRelationshipOwner() {
@@ -249,7 +249,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 
 	@Override
 	public boolean isOverridableAssociationMapping() {
-		return this.relationshipReference.isOverridable();
+		return this.relationship.isOverridable();
 	}
 
 	public Iterator<String> allTargetEntityAttributeNames() {
@@ -285,7 +285,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 			return result;
 		}
 
-		result = this.relationshipReference.javaCompletionProposals(pos, filter, astRoot);
+		result = this.relationship.javaCompletionProposals(pos, filter, astRoot);
 		if (result != null) {
 			return result;
 		}
@@ -308,7 +308,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
 	public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
 		super.validate(messages, reporter, astRoot);
 		this.validateTargetEntity(messages, astRoot);
-		this.relationshipReference.validate(messages, reporter, astRoot);
+		this.relationship.validate(messages, reporter, astRoot);
 	}
 
 	protected void validateTargetEntity(List<IMessage> messages, CompilationUnit astRoot) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java
index a645ce4277..f6b53ec25e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,7 +16,7 @@ import org.eclipse.jpt.core.context.AttributeMapping;
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.ReadOnlyTable;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
@@ -251,9 +251,9 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation>
 		return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER);
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) {
-			RelationshipReference relationship = attributeMapping.resolveOverriddenRelationship(attributeName);
+			Relationship relationship = attributeMapping.resolveOverriddenRelationship(attributeName);
 			if (relationship != null) {
 				return relationship;
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyRelationship.java
index a434a7196d..45b97dd4e2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,14 +14,14 @@ import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
-import org.eclipse.jpt.core.context.java.JavaManyToManyRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaManyToManyRelationship;
 import org.eclipse.jpt.core.context.java.JavaMappedByJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaMappingJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.resource.java.OwnableRelationshipMappingAnnotation;
@@ -29,16 +29,16 @@ import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericJavaManyToManyRelationshipReference
+public class GenericJavaManyToManyRelationship
 	extends AbstractJavaMappingRelationship<JavaManyToManyMapping>
-	implements JavaManyToManyRelationshipReference
+	implements JavaManyToManyRelationship
 {
 	protected final JavaMappedByJoiningStrategy mappedByStrategy;
 
 	protected final JavaJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericJavaManyToManyRelationshipReference(JavaManyToManyMapping parent) {
+	public GenericJavaManyToManyRelationship(JavaManyToManyMapping parent) {
 		super(parent);
 		this.mappedByStrategy = this.buildMappedByStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -127,19 +127,19 @@ public class GenericJavaManyToManyRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneRelationship.java
index bbaf124de1..b2315293ba 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,24 +12,24 @@ package org.eclipse.jpt.core.internal.context.java;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaMappingJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa1.context.java.NullJavaJoinTableJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneRelationship2_0;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericJavaManyToOneRelationshipReference
+public class GenericJavaManyToOneRelationship
 	extends AbstractJavaMappingRelationship<JavaManyToOneMapping>
-	implements JavaManyToOneRelationshipReference2_0
+	implements JavaManyToOneRelationship2_0
 {
 	protected final JavaJoinColumnJoiningStrategy joinColumnStrategy;
 
@@ -37,7 +37,7 @@ public class GenericJavaManyToOneRelationshipReference
 	protected final JavaJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericJavaManyToOneRelationshipReference(JavaManyToOneMapping parent) {
+	public GenericJavaManyToOneRelationship(JavaManyToOneMapping parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -131,19 +131,19 @@ public class GenericJavaManyToOneRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinColumnRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedByJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedByJoiningStrategy.java
index 2f9a189fde..4dd30f3c33 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedByJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedByJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.context.MappedByJoiningStrategy;
 import org.eclipse.jpt.core.context.PersistentAttribute;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.java.JavaMappedByJoiningStrategy;
-import org.eclipse.jpt.core.context.java.JavaOwnableRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaMappedByRelationship;
 import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationDescriptionMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
@@ -41,7 +41,7 @@ public class GenericJavaMappedByJoiningStrategy
 	protected String mappedByAttribute;
 
 
-	public GenericJavaMappedByJoiningStrategy(JavaOwnableRelationshipReference parent) {
+	public GenericJavaMappedByJoiningStrategy(JavaMappedByRelationship parent) {
 		super(parent);
 		this.mappedByAttribute = this.buildMappedByAttribute();
 	}
@@ -84,19 +84,19 @@ public class GenericJavaMappedByJoiningStrategy
 	// ********** misc **********
 
 	protected OwnableRelationshipMappingAnnotation getMappingAnnotation() {
-		return this.getRelationshipReference().getMappingAnnotation();
+		return this.getRelationship().getMappingAnnotation();
 	}
 
 	protected OwnableRelationshipMappingAnnotation getMappingAnnotationForUpdate() {
-		return this.getRelationshipReference().getMappingAnnotationForUpdate();
+		return this.getRelationship().getMappingAnnotationForUpdate();
 	}
 
 	@Override
-	public JavaOwnableRelationshipReference getParent() {
-		return (JavaOwnableRelationshipReference) super.getParent();
+	public JavaMappedByRelationship getParent() {
+		return (JavaMappedByRelationship) super.getParent();
 	}
 
-	public JavaOwnableRelationshipReference getRelationshipReference() {
+	public JavaMappedByRelationship getRelationship() {
 		return this.getParent();
 	}
 
@@ -106,22 +106,22 @@ public class GenericJavaMappedByJoiningStrategy
 
 	public String getTableName() {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner == null) ? null : owner.getRelationshipReference().getPredominantJoiningStrategy().getTableName();
+		return (owner == null) ? null : owner.getRelationship().getPredominantJoiningStrategy().getTableName();
 	}
 
 	public Table resolveDbTable(String tableName) {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner == null) ? null : owner.getRelationshipReference().getPredominantJoiningStrategy().resolveDbTable(tableName);
+		return (owner == null) ? null : owner.getRelationship().getPredominantJoiningStrategy().resolveDbTable(tableName);
 	}
 
 	public boolean tableNameIsInvalid(String tableName) {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner != null) && owner.getRelationshipReference().getPredominantJoiningStrategy().tableNameIsInvalid(tableName);
+		return (owner != null) && owner.getRelationship().getPredominantJoiningStrategy().tableNameIsInvalid(tableName);
 	}
 
 	public String getColumnTableNotValidDescription() {
 		//this will not be called if getRelationshipOwner() is null
-		return this.getRelationshipOwner().getRelationshipReference().getPredominantJoiningStrategy().getColumnTableNotValidDescription();
+		return this.getRelationshipOwner().getRelationship().getPredominantJoiningStrategy().getColumnTableNotValidDescription();
 	}
 
 	protected RelationshipMapping getRelationshipOwner() {
@@ -133,7 +133,7 @@ public class GenericJavaMappedByJoiningStrategy
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public boolean relationshipIsOwnedBy(RelationshipMapping otherMapping) {
@@ -145,7 +145,7 @@ public class GenericJavaMappedByJoiningStrategy
 	}
 
 	protected String getEntityName() {
-		Entity entity = this.getRelationshipReference().getEntity();
+		Entity entity = this.getRelationship().getEntity();
 		return (entity == null) ? null : entity.getName();
 	}
 
@@ -223,7 +223,7 @@ public class GenericJavaMappedByJoiningStrategy
 			return;
 		}
 
-		if ( ! this.getRelationshipReference().mayBeMappedBy(mappedByMapping)) {
+		if ( ! this.getRelationship().mayBeMappedBy(mappedByMapping)) {
 			messages.add(
 				this.buildMessage(
 					JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappingJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappingJoinColumnJoiningStrategy.java
index 195aaa06b1..dea20396e9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappingJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappingJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -90,12 +90,12 @@ public class GenericJavaMappingJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	protected JavaResourcePersistentAttribute getResourcePersistentAttribute() {
-		return this.getRelationshipReference().getMapping().getResourcePersistentAttribute();
+		return this.getRelationship().getMapping().getResourcePersistentAttribute();
 	}
 
 	@Override
-	public JavaMappingJoinColumnRelationship getRelationshipReference() {
-		return (JavaMappingJoinColumnRelationship) super.getRelationshipReference();
+	public JavaMappingJoinColumnRelationship getRelationship() {
+		return (JavaMappingJoinColumnRelationship) super.getRelationship();
 	}
 
 	@Override
@@ -138,7 +138,7 @@ public class GenericJavaMappingJoinColumnJoiningStrategy
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getRelationshipReference().getValidationTextRange(astRoot);
+		return this.getRelationship().getValidationTextRange(astRoot);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyRelationship.java
index 583c20ed7f..f67e886e0c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,11 +14,11 @@ import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
@@ -26,7 +26,7 @@ import org.eclipse.jpt.core.context.java.JavaMappedByJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaMappingJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa1.context.java.NullJavaJoinColumnJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.java.JavaOneToManyRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaOneToManyRelationship2_0;
 import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -34,7 +34,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
 public class GenericJavaOneToManyRelationship
 	extends AbstractJavaMappingRelationship<JavaOneToManyMapping>
-	implements JavaOneToManyRelationshipReference2_0
+	implements JavaOneToManyRelationship2_0
 {
 	protected final JavaMappedByJoiningStrategy mappedByStrategy;
 
@@ -183,26 +183,26 @@ public class GenericJavaOneToManyRelationship
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneRelationship.java
index 9597b92ca9..a058871284 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,11 +14,11 @@ import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
@@ -27,15 +27,15 @@ import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaMappingJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa1.context.java.NullJavaJoinTableJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneRelationship2_0;
 import org.eclipse.jpt.core.resource.java.OwnableRelationshipMappingAnnotation;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericJavaOneToOneRelationshipReference
+public class GenericJavaOneToOneRelationship
 	extends AbstractJavaMappingRelationship<JavaOneToOneMapping>
-	implements JavaOneToOneRelationshipReference2_0
+	implements JavaOneToOneRelationship2_0
 {
 	protected final JavaMappedByJoiningStrategy mappedByStrategy;
 
@@ -47,7 +47,7 @@ public class GenericJavaOneToOneRelationshipReference
 	protected final JavaJoinColumnJoiningStrategy joinColumnStrategy;
 
 
-	public GenericJavaOneToOneRelationshipReference(JavaOneToOneMapping parent) {
+	public GenericJavaOneToOneRelationship(JavaOneToOneMapping parent) {
 		super(parent);
 		this.mappedByStrategy = this.buildMappedByStrategy();
 		this.primaryKeyJoinColumnStrategy = this.buildPrimaryKeyJoinColumnStrategy();
@@ -209,7 +209,7 @@ public class GenericJavaOneToOneRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
@@ -217,19 +217,19 @@ public class GenericJavaOneToOneRelationshipReference
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOverrideJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOverrideJoinColumnJoiningStrategy.java
index 5b8523fd3c..b915a4be39 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOverrideJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOverrideJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaOverrideRelationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumn;
 import org.eclipse.jpt.core.context.java.JavaJoinColumn.Owner;
 import org.eclipse.jpt.core.internal.context.BaseColumnTextRangeResolver;
@@ -36,7 +36,7 @@ import org.eclipse.jpt.db.Table;
 public class GenericJavaOverrideJoinColumnJoiningStrategy
 	extends AbstractJavaJoinColumnJoiningStrategy
 {
-	public GenericJavaOverrideJoinColumnJoiningStrategy(JavaAssociationOverrideRelationshipReference parent) {
+	public GenericJavaOverrideJoinColumnJoiningStrategy(JavaOverrideRelationship parent) {
 		super(parent);
 	}
 
@@ -83,7 +83,7 @@ public class GenericJavaOverrideJoinColumnJoiningStrategy
 	public boolean isTargetForeignKey() {
 		RelationshipMapping relationshipMapping = this.getRelationshipMapping();
 		return (relationshipMapping != null) &&
-				relationshipMapping.getRelationshipReference().isTargetForeignKey();
+				relationshipMapping.getRelationship().isTargetForeignKey();
 	}
 
 	public TypeMapping getRelationshipSource() {
@@ -154,7 +154,7 @@ public class GenericJavaOverrideJoinColumnJoiningStrategy
 	}
 
 	protected JavaAssociationOverride getAssociationOverride() {
-		return this.getRelationshipReference().getAssociationOverride();
+		return this.getRelationship().getAssociationOverride();
 	}
 
 	protected JavaAssociationOverrideContainer getAssociationOverrideContainer() {
@@ -162,12 +162,12 @@ public class GenericJavaOverrideJoinColumnJoiningStrategy
 	}
 
 	@Override
-	public JavaAssociationOverrideRelationshipReference getRelationshipReference() {
-		return (JavaAssociationOverrideRelationshipReference) super.getRelationshipReference();
+	public JavaOverrideRelationship getRelationship() {
+		return (JavaOverrideRelationship) super.getRelationship();
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getRelationshipReference().getValidationTextRange(astRoot);
+		return this.getRelationship().getValidationTextRange(astRoot);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnJoiningStrategy.java
index c954d2237d..09bb1ad25c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaJoinColumn;
 import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumnRelationship;
 import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaRelationshipMapping;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
@@ -55,7 +55,7 @@ public class GenericJavaPrimaryKeyJoinColumnJoiningStrategy
 	protected final JavaJoinColumn.Owner primaryKeyJoinColumnOwner;
 
 
-	public GenericJavaPrimaryKeyJoinColumnJoiningStrategy(JavaPrimaryKeyJoinColumnEnabledRelationshipReference parent) {
+	public GenericJavaPrimaryKeyJoinColumnJoiningStrategy(JavaPrimaryKeyJoinColumnRelationship parent) {
 		super(parent);
 		this.primaryKeyJoinColumnContainerAdapter = this.buildPrimaryKeyJoinColumnContainerAdapter();
 		this.primaryKeyJoinColumnOwner = this.buildPrimaryKeyJoinColumnOwner();
@@ -220,20 +220,20 @@ public class GenericJavaPrimaryKeyJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaPrimaryKeyJoinColumnEnabledRelationshipReference getParent() {
-		return (JavaPrimaryKeyJoinColumnEnabledRelationshipReference) super.getParent();
+	public JavaPrimaryKeyJoinColumnRelationship getParent() {
+		return (JavaPrimaryKeyJoinColumnRelationship) super.getParent();
 	}
 
-	public JavaPrimaryKeyJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public JavaPrimaryKeyJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected JavaRelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	protected JavaResourcePersistentAttribute getResourcePersistentAttribute() {
-		return this.getRelationshipReference().getMapping().getResourcePersistentAttribute();
+		return this.getRelationship().getMapping().getResourcePersistentAttribute();
 	}
 
 	public String getTableName() {
@@ -302,7 +302,7 @@ public class GenericJavaPrimaryKeyJoinColumnJoiningStrategy
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getRelationshipReference().getValidationTextRange(astRoot);
+		return this.getRelationship().getValidationTextRange(astRoot);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVirtualJoinTable.java
index d53383bdf0..5385fc9a09 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVirtualJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVirtualJoinTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumn;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinTable;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinTableJoiningStrategy;
-import org.eclipse.jpt.core.context.java.JavaVirtualRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualRelationship;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.utility.internal.CollectionTools;
@@ -227,7 +227,7 @@ public class GenericJavaVirtualJoinTable
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getJoinStrategy().getRelationshipReference().getMapping();
+		return this.getJoinStrategy().getRelationship().getMapping();
 	}
 
 	public PersistentAttribute getPersistentAttribute() {
@@ -248,7 +248,7 @@ public class GenericJavaVirtualJoinTable
 		}
 
 		public TypeMapping getTypeMapping() {
-			return this.getRelationshipReference().getTypeMapping();
+			return this.getRelationship().getTypeMapping();
 		}
 
 		/**
@@ -266,8 +266,8 @@ public class GenericJavaVirtualJoinTable
 			throw new UnsupportedOperationException();
 		}
 
-		protected JavaVirtualRelationshipReference getRelationshipReference() {
-			return GenericJavaVirtualJoinTable.this.getJoinStrategy().getRelationshipReference();
+		protected JavaVirtualRelationship getRelationship() {
+			return GenericJavaVirtualJoinTable.this.getJoinStrategy().getRelationship();
 		}
 	}
 
@@ -284,7 +284,7 @@ public class GenericJavaVirtualJoinTable
 		}
 
 		public Entity getRelationshipTarget() {
-			return this.getRelationshipReference().getEntity();
+			return this.getRelationship().getEntity();
 		}
 
 		public String getAttributeName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java
index 13fbb1e632..940ad57ff1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.ColumnMapping;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
@@ -290,9 +290,9 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping>
 		return ((mapping != null) && mapping.isOverridableAttributeMapping()) ? (ColumnMapping) mapping : null;
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		RelationshipMapping mapping = this.resolveRelationshipMapping(attributeName);
-		return (mapping == null) ? null : mapping.getRelationshipReference();
+		return (mapping == null) ? null : mapping.getRelationship();
 	}
 
 	protected RelationshipMapping resolveRelationshipMapping(String attributeName) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
index 411bfd35ea..3b3c620308 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -45,7 +45,7 @@ import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyPrimaryKeyJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlySecondaryTable;
 import org.eclipse.jpt.core.context.ReadOnlyTable;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.SecondaryTable;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
@@ -1378,25 +1378,25 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		if (this.isJpa2_0Compatible()) {
 			// strip off the first segment
 			int dotIndex = attributeName.indexOf('.');
 			if (dotIndex != -1) {
 				AssociationOverride override = this.associationOverrideContainer.getSpecifiedOverrideNamed(attributeName.substring(dotIndex + 1));
 				if (override != null) {
-					return override.getRelationshipReference();
+					return override.getRelationship();
 				}
 			}
 		}
 		return super.resolveOverriddenRelationship(attributeName);
 	}
 
-	protected RelationshipReference resolveOverriddenRelationshipForAssociationOverride(String attributeName) {
+	protected Relationship resolveOverriddenRelationshipForAssociationOverride(String attributeName) {
 		if ( ! this.isMetadataComplete()) {
 			JavaPersistentType javaType = this.getJavaPersistentType();
 			if (javaType != null) {
-				RelationshipReference relationship = javaType.getMapping().resolveOverriddenRelationship(attributeName);
+				Relationship relationship = javaType.getMapping().resolveOverriddenRelationship(attributeName);
 				if (relationship != null) {
 					return relationship;
 				}
@@ -2107,7 +2107,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
 			return AbstractOrmEntity.this.xmlTypeMapping.getAssociationOverrides();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			return AbstractOrmEntity.this.resolveOverriddenRelationshipForAssociationOverride(attributeName);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinColumnJoiningStrategy.java
index 800f0cce67..186ceb041b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmJoinColumnRelationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.resource.orm.OrmFactory;
@@ -47,7 +47,7 @@ public abstract class AbstractOrmJoinColumnJoiningStrategy
 	protected OrmJoinColumn defaultJoinColumn;
 
 
-	protected AbstractOrmJoinColumnJoiningStrategy(OrmJoinColumnEnabledRelationshipReference parent) {
+	protected AbstractOrmJoinColumnJoiningStrategy(OrmJoinColumnRelationship parent) {
 		super(parent);
 		this.specifiedJoinColumnContainerAdapter = this.buildSpecifiedJoinColumnContainerAdapter();
 		this.joinColumnOwner = this.buildJoinColumnOwner();
@@ -74,7 +74,7 @@ public abstract class AbstractOrmJoinColumnJoiningStrategy
 	// ********** XML join column container **********
 
 	protected XmlJoinColumnContainer getXmlJoinColumnContainer() {
-		return this.getRelationshipReference().getXmlContainer();
+		return this.getRelationship().getXmlContainer();
 	}
 
 
@@ -246,18 +246,18 @@ public abstract class AbstractOrmJoinColumnJoiningStrategy
 
 	protected boolean buildsDefaultJoinColumn() {
 		return ! this.hasSpecifiedJoinColumns() &&
-				this.getRelationshipReference().mayHaveDefaultJoinColumn();
+				this.getRelationship().mayHaveDefaultJoinColumn();
 	}
 
 
 	// ********** misc **********
 
 	@Override
-	public OrmJoinColumnEnabledRelationshipReference getParent() {
-		return (OrmJoinColumnEnabledRelationshipReference) super.getParent();
+	public OrmJoinColumnRelationship getParent() {
+		return (OrmJoinColumnRelationship) super.getParent();
 	}
 
-	public OrmJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public OrmJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
@@ -278,7 +278,7 @@ public abstract class AbstractOrmJoinColumnJoiningStrategy
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public String getTableName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinTableJoiningStrategy.java
index 799ed63bd8..3a83f220b0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmJoinTableRelationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.core.internal.validation.JpaValidationDescriptionMessages;
@@ -33,7 +33,7 @@ public abstract class AbstractOrmJoinTableJoiningStrategy
 	protected OrmJoinTable joinTable;
 
 
-	protected AbstractOrmJoinTableJoiningStrategy(OrmJoinTableEnabledRelationshipReference parent) {
+	protected AbstractOrmJoinTableJoiningStrategy(OrmJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -87,7 +87,7 @@ public abstract class AbstractOrmJoinTableJoiningStrategy
 	 */
 	protected boolean buildsJoinTable() {
 		return (this.getXmlJoinTable() != null) ||
-				this.getRelationshipReference().mayHaveDefaultJoinTable();
+				this.getRelationship().mayHaveDefaultJoinTable();
 	}
 
 	protected OrmJoinTable buildJoinTable() {
@@ -112,7 +112,7 @@ public abstract class AbstractOrmJoinTableJoiningStrategy
 	}
 
 	protected XmlJoinTableContainer getXmlJoinTableContainer() {
-		return this.getRelationshipReference().getXmlContainer();
+		return this.getRelationship().getXmlContainer();
 	}
 
 
@@ -130,16 +130,16 @@ public abstract class AbstractOrmJoinTableJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmJoinTableEnabledRelationshipReference getParent() {
-		return (OrmJoinTableEnabledRelationshipReference) super.getParent();
+	public OrmJoinTableRelationship getParent() {
+		return (OrmJoinTableRelationship) super.getParent();
 	}
 
-	public OrmJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public OrmJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public void initializeFrom(ReadOnlyJoinTableJoiningStrategy oldStrategy) {
@@ -175,7 +175,7 @@ public abstract class AbstractOrmJoinTableJoiningStrategy
 	}
 
 	public String getJoinTableDefaultName() {
-		return MappingTools.buildJoinTableDefaultName(this.getRelationshipReference());
+		return MappingTools.buildJoinTableDefaultName(this.getRelationship());
 	}
 
 	public void addStrategy() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToManyMapping.java
index 23c8cf6dbd..2b995ec0a9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToManyMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,8 +11,8 @@ package org.eclipse.jpt.core.internal.context.orm;
 
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyRelationshipReference;
-import org.eclipse.jpt.core.context.orm.OrmMappingRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmManyToManyRelationship;
+import org.eclipse.jpt.core.context.orm.OrmMappingRelationship;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToManyMapping2_0;
 import org.eclipse.jpt.core.resource.orm.Attributes;
@@ -30,13 +30,13 @@ public abstract class AbstractOrmManyToManyMapping<X extends XmlManyToMany>
 	// ********** relationship **********
 
 	@Override
-	public OrmManyToManyRelationshipReference getRelationshipReference() {
-		return (OrmManyToManyRelationshipReference) super.getRelationshipReference();
+	public OrmManyToManyRelationship getRelationship() {
+		return (OrmManyToManyRelationship) super.getRelationship();
 	}
 
 	@Override
-	protected OrmMappingRelationshipReference buildRelationshipReference() {
-		return new GenericOrmManyToManyRelationshipReference(this);
+	protected OrmMappingRelationship buildRelationship() {
+		return new GenericOrmManyToManyRelationship(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToOneMapping.java
index cc51eba411..708eadf556 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmManyToOneMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneMapping2_0;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneRelationship2_0;
 import org.eclipse.jpt.core.resource.orm.Attributes;
 import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
 
@@ -32,13 +32,13 @@ public abstract class AbstractOrmManyToOneMapping<X extends XmlManyToOne>
 	// ********** relationship **********
 
 	@Override
-	protected OrmManyToOneRelationshipReference2_0 buildRelationshipReference() {
-		return new GenericOrmManyToOneRelationshipReference(this);
+	protected OrmManyToOneRelationship2_0 buildRelationship() {
+		return new GenericOrmManyToOneRelationship(this);
 	}
 
 	@Override
-	public OrmManyToOneRelationshipReference2_0 getRelationshipReference() {
-		return (OrmManyToOneRelationshipReference2_0) super.getRelationshipReference();
+	public OrmManyToOneRelationship2_0 getRelationship() {
+		return (OrmManyToOneRelationship2_0) super.getRelationship();
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMappingRelationship.java
index a1d349bcfb..737ceb61bf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMappingRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMappingRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,13 +11,13 @@ package org.eclipse.jpt.core.internal.context.orm;
 
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.JoiningStrategy;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyRelationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmJoiningStrategy;
-import org.eclipse.jpt.core.context.orm.OrmMappingRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmMappingRelationship;
 import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
 import org.eclipse.jpt.core.resource.orm.AbstractXmlRelationshipMapping;
 import org.eclipse.jpt.core.utility.TextRange;
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.utility.TextRange;
  */
 public abstract class AbstractOrmMappingRelationship<M extends OrmRelationshipMapping>
 	extends AbstractOrmXmlContextNode
-	implements OrmMappingRelationshipReference
+	implements OrmMappingRelationship
 {
 	protected OrmJoiningStrategy strategy;
 
@@ -73,19 +73,19 @@ public abstract class AbstractOrmMappingRelationship<M extends OrmRelationshipMa
 
 	// ********** conversions **********
 
-	public void initializeFrom(ReadOnlyRelationshipReference oldRelationship) {
+	public void initializeFrom(ReadOnlyRelationship oldRelationship) {
 		oldRelationship.initializeOn(this);
 	}
 
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		// NOP
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
index aa65edd0b9..c6c8bba3ae 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -171,7 +171,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 			return this.getJoinStrategy().resolveDbTable(tableName);
 		}
 		protected OrmJoiningStrategy getJoinStrategy() {
-			return AbstractOrmMultiRelationshipMapping.this.getRelationshipReference().getPredominantJoiningStrategy();
+			return AbstractOrmMultiRelationshipMapping.this.getRelationship().getPredominantJoiningStrategy();
 		}
 	}
 
@@ -712,7 +712,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 		}
 
 		protected OrmJoiningStrategy getJoinStrategy() {
-			return AbstractOrmMultiRelationshipMapping.this.getRelationshipReference().getPredominantJoiningStrategy();
+			return AbstractOrmMultiRelationshipMapping.this.getRelationship().getPredominantJoiningStrategy();
 		}
 
 		protected String getMappingName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToManyMapping.java
index 19c406c9b9..0ea0d52208 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToManyMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToManyMapping2_0;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToManyRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovable2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
 import org.eclipse.jpt.core.resource.orm.Attributes;
@@ -65,13 +65,13 @@ public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany>
 	// ********** relationship **********
 
 	@Override
-	protected OrmOneToManyRelationshipReference2_0 buildRelationshipReference() {
-		return new GenericOrmOneToManyRelationshipReference(this, this.isJpa2_0Compatible());
+	protected OrmOneToManyRelationship2_0 buildRelationship() {
+		return new GenericOrmOneToManyRelationship(this, this.isJpa2_0Compatible());
 	}
 
 	@Override
-	public OrmOneToManyRelationshipReference2_0 getRelationshipReference() {
-		return (OrmOneToManyRelationshipReference2_0) super.getRelationshipReference();
+	public OrmOneToManyRelationship2_0 getRelationship() {
+		return (OrmOneToManyRelationship2_0) super.getRelationship();
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToOneMapping.java
index 50bb83a0e0..22cb596504 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmOneToOneMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,11 +11,11 @@ package org.eclipse.jpt.core.internal.context.orm;
 
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
-import org.eclipse.jpt.core.context.orm.OrmMappingRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmMappingRelationship;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneMapping2_0;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneRelationship2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovable2_0;
 import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
 import org.eclipse.jpt.core.resource.orm.Attributes;
@@ -68,13 +68,13 @@ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne>
 	// ********** relationship **********
 
 	@Override
-	public OrmOneToOneRelationshipReference2_0 getRelationshipReference() {
-		return (OrmOneToOneRelationshipReference2_0) super.getRelationshipReference();
+	public OrmOneToOneRelationship2_0 getRelationship() {
+		return (OrmOneToOneRelationship2_0) super.getRelationship();
 	}
 
 	@Override
-	protected OrmMappingRelationshipReference buildRelationshipReference() {
-		return new GenericOrmOneToOneRelationshipReference(this);
+	protected OrmMappingRelationship buildRelationship() {
+		return new GenericOrmOneToOneRelationship(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java
index 253670ff33..d9c29d67b6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.context.ReadOnlyPersistentAttribute;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmCascade;
-import org.eclipse.jpt.core.context.orm.OrmMappingRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmMappingRelationship;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping;
 import org.eclipse.jpt.core.internal.context.AttributeMappingTools;
@@ -53,7 +53,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 	protected String specifiedTargetEntity;
 	protected String defaultTargetEntity;
 
-	protected final OrmMappingRelationshipReference relationshipReference;
+	protected final OrmMappingRelationship relationship;
 
 	protected final OrmCascade cascade;
 
@@ -64,7 +64,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 	protected AbstractOrmRelationshipMapping(OrmPersistentAttribute parent, X xmlMapping) {
 		super(parent, xmlMapping);
 		this.specifiedTargetEntity = xmlMapping.getTargetEntity();
-		this.relationshipReference = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 		this.cascade = this.buildCascade();
 		this.specifiedFetch = this.buildSpecifiedFetch();
 	}
@@ -76,7 +76,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 	public void synchronizeWithResourceModel() {
 		super.synchronizeWithResourceModel();
 		this.setSpecifiedTargetEntity_(this.xmlAttributeMapping.getTargetEntity());
-		this.relationshipReference.synchronizeWithResourceModel();
+		this.relationship.synchronizeWithResourceModel();
 		this.cascade.synchronizeWithResourceModel();
 		this.setSpecifiedFetch_(this.buildSpecifiedFetch());
 	}
@@ -85,7 +85,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 	public void update() {
 		super.update();
 		this.setDefaultTargetEntity(this.buildDefaultTargetEntity());
-		this.relationshipReference.update();
+		this.relationship.update();
 		this.cascade.update();
 		this.setDefaultFetch(this.buildDefaultFetch());
 	}
@@ -154,11 +154,11 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 
 	// ********** relationship reference **********
 
-	public OrmMappingRelationshipReference getRelationshipReference() {
-		return this.relationshipReference;
+	public OrmMappingRelationship getRelationship() {
+		return this.relationship;
 	}
 
-	protected abstract OrmMappingRelationshipReference buildRelationshipReference();
+	protected abstract OrmMappingRelationship buildRelationship();
 
 
 	// ********** cascade **********
@@ -215,13 +215,13 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 
 	@Override
 	public boolean isRelationshipOwner() {
-		return this.relationshipReference.isOwner();
+		return this.relationship.isOwner();
 	}
 
 	@Override
 	public boolean isOwnedBy(AttributeMapping mapping) {
 		return mapping.isRelationshipOwner() &&
-			this.relationshipReference.isOwnedBy((RelationshipMapping) mapping);
+			this.relationship.isOwnedBy((RelationshipMapping) mapping);
 	}
 
 	public RelationshipMapping getRelationshipOwner() {
@@ -240,7 +240,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 
 	@Override
 	public boolean isOverridableAssociationMapping() {
-		return this.relationshipReference.isOverridable();
+		return this.relationship.isOverridable();
 	}
 
 	@Override
@@ -248,7 +248,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 		super.initializeFromOrmRelationshipMapping(oldMapping);
 		this.setSpecifiedTargetEntity(oldMapping.getSpecifiedTargetEntity());
 		this.setSpecifiedFetch(oldMapping.getSpecifiedFetch());
-		oldMapping.getRelationshipReference().initializeOn(this.relationshipReference);
+		oldMapping.getRelationship().initializeOn(this.relationship);
 		this.cascade.initializeFrom(oldMapping.getCascade());
 		//TODO should we set the fetch type from a BasicMapping??
 	}
@@ -351,7 +351,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
 	public void validate(List<IMessage> messages, IReporter reporter) {
 		super.validate(messages, reporter);
 		this.validateTargetEntity(messages);
-		this.relationshipReference.validate(messages, reporter);
+		this.relationship.validate(messages, reporter);
 	}
 
 	protected void validateTargetEntity(List<IMessage> messages) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java
index 2fecfe2ce2..386dc7e9de 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.JpaStructureNode;
 import org.eclipse.jpt.core.context.AttributeMapping;
 import org.eclipse.jpt.core.context.Column;
 import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.core.context.java.JavaTypeMapping;
@@ -313,11 +313,11 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
 		return new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy(), TypeMappingTools.OVERRIDABLE_ASSOCIATION_NAMES_TRANSFORMER);
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		for (AttributeMapping attributeMapping : CollectionTools.iterable(this.attributeMappings())) {
-			RelationshipReference resolvedRelationshipReference = attributeMapping.resolveOverriddenRelationship(attributeName);
-			if (resolvedRelationshipReference != null) {
-				return resolvedRelationshipReference;
+			Relationship relationship = attributeMapping.resolveOverriddenRelationship(attributeName);
+			if (relationship != null) {
+				return relationship;
 			}
 		}
 		if ( ! this.isMetadataComplete()) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
index 821bf6e207..0d194cb431 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.context.java.JavaSecondaryTable;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideContainer;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmOverrideRelationship;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeOverride;
 import org.eclipse.jpt.core.context.orm.OrmAttributeOverrideContainer;
@@ -65,7 +65,7 @@ import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
 import org.eclipse.jpt.core.context.orm.OrmUniqueConstraint;
 import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
 import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualOverrideRelationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualAttributeOverride;
 import org.eclipse.jpt.core.context.orm.OrmVirtualColumn;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumn;
@@ -79,7 +79,7 @@ import org.eclipse.jpt.core.context.orm.OrmXmlContextNodeFactory;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericEntityMappings;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmAssociationOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideContainer;
-import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmOverrideRelationship;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmAttributeOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmAttributeOverrideContainer;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmBasicMapping;
@@ -121,7 +121,7 @@ import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmTransientMapping
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmUniqueConstraint;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVersionMapping;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualAssociationOverride;
-import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualOverrideRelationship;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualAttributeOverride;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualColumn;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmVirtualJoinColumn;
@@ -260,12 +260,12 @@ public abstract class AbstractOrmXmlContextNodeFactory
 		return new GenericOrmVirtualAssociationOverride(parent, name);
 	}
 	
-	public OrmAssociationOverrideRelationshipReference buildOrmAssociationOverrideRelationshipReference(OrmAssociationOverride parent) {
-		return new GenericOrmAssociationOverrideRelationshipReference(parent);
+	public OrmOverrideRelationship buildOrmOverrideRelationship(OrmAssociationOverride parent) {
+		return new GenericOrmOverrideRelationship(parent);
 	}
 	
-	public OrmVirtualAssociationOverrideRelationshipReference buildOrmVirtualAssociationOverrideRelationshipReference(OrmVirtualAssociationOverride parent) {
-		return new GenericOrmVirtualAssociationOverrideRelationshipReference(parent);
+	public OrmVirtualOverrideRelationship buildOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent) {
+		return new GenericOrmVirtualOverrideRelationship(parent);
 	}
 	
 	public OrmDiscriminatorColumn buildOrmDiscriminatorColumn(OrmEntity parent, OrmDiscriminatorColumn.Owner owner) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyRelationship.java
index a3ef0589e7..640ad4b2d2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,29 +12,29 @@ package org.eclipse.jpt.core.internal.context.orm;
 import java.util.List;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping;
-import org.eclipse.jpt.core.context.orm.OrmManyToManyRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmManyToManyRelationship;
 import org.eclipse.jpt.core.context.orm.OrmMappedByJoiningStrategy;
 import org.eclipse.jpt.core.resource.orm.XmlManyToMany;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericOrmManyToManyRelationshipReference
+public class GenericOrmManyToManyRelationship
 	extends AbstractOrmMappingRelationship<OrmManyToManyMapping>
-	implements OrmManyToManyRelationshipReference
+	implements OrmManyToManyRelationship
 {
 	protected final OrmMappedByJoiningStrategy mappedByStrategy;
 
 	protected final OrmJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericOrmManyToManyRelationshipReference(OrmManyToManyMapping parent) {
+	public GenericOrmManyToManyRelationship(OrmManyToManyMapping parent) {
 		super(parent);
 		this.mappedByStrategy = this.buildMappedByStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -123,19 +123,19 @@ public class GenericOrmManyToManyRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneRelationship.java
index dbb50df43a..86420c951f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,22 +10,22 @@
 package org.eclipse.jpt.core.internal.context.orm;
 
 import java.util.List;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneRelationship2_0;
 import org.eclipse.jpt.core.resource.orm.XmlManyToOne;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericOrmManyToOneRelationshipReference
+public class GenericOrmManyToOneRelationship
 	extends AbstractOrmMappingRelationship<OrmManyToOneMapping>
-	implements OrmManyToOneRelationshipReference2_0
+	implements OrmManyToOneRelationship2_0
 {
 	protected final OrmJoinColumnJoiningStrategy joinColumnStrategy;
 
@@ -33,7 +33,7 @@ public class GenericOrmManyToOneRelationshipReference
 	protected final OrmJoinTableJoiningStrategy joinTableStrategy;
 
 	
-	public GenericOrmManyToOneRelationshipReference(OrmManyToOneMapping parent) {
+	public GenericOrmManyToOneRelationship(OrmManyToOneMapping parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -128,19 +128,19 @@ public class GenericOrmManyToOneRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinColumnRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedByJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedByJoiningStrategy.java
index 9d27768d33..a55e657105 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedByJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedByJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.context.MappedByJoiningStrategy;
 import org.eclipse.jpt.core.context.PersistentAttribute;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.orm.OrmMappedByJoiningStrategy;
-import org.eclipse.jpt.core.context.orm.OrmOwnableRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmMappedByRelationship;
 import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationDescriptionMessages;
 import org.eclipse.jpt.core.internal.validation.JpaValidationMessages;
@@ -37,7 +37,7 @@ public class GenericOrmMappedByJoiningStrategy
 	protected String mappedByAttribute;
 
 
-	public GenericOrmMappedByJoiningStrategy(OrmOwnableRelationshipReference parent) {
+	public GenericOrmMappedByJoiningStrategy(OrmMappedByRelationship parent) {
 		super(parent);
 		this.mappedByAttribute = this.getXmlMappedByMapping().getMappedBy();
 	}
@@ -73,16 +73,16 @@ public class GenericOrmMappedByJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmOwnableRelationshipReference getParent() {
-		return (OrmOwnableRelationshipReference) super.getParent();
+	public OrmMappedByRelationship getParent() {
+		return (OrmMappedByRelationship) super.getParent();
 	}
 
-	public OrmOwnableRelationshipReference getRelationshipReference() {
+	public OrmMappedByRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected XmlMappedByMapping getXmlMappedByMapping() {
-		return this.getRelationshipReference().getXmlContainer();
+		return this.getRelationship().getXmlContainer();
 	}
 
 	public void initializeFrom(MappedByJoiningStrategy oldStrategy) {
@@ -91,22 +91,22 @@ public class GenericOrmMappedByJoiningStrategy
 
 	public String getTableName() {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner == null) ? null : owner.getRelationshipReference().getPredominantJoiningStrategy().getTableName();
+		return (owner == null) ? null : owner.getRelationship().getPredominantJoiningStrategy().getTableName();
 	}
 
 	public Table resolveDbTable(String tableName) {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner == null) ? null : owner.getRelationshipReference().getPredominantJoiningStrategy().resolveDbTable(tableName);
+		return (owner == null) ? null : owner.getRelationship().getPredominantJoiningStrategy().resolveDbTable(tableName);
 	}
 
 	public boolean tableNameIsInvalid(String tableName) {
 		RelationshipMapping owner = this.getRelationshipOwner();
-		return (owner != null) && owner.getRelationshipReference().getPredominantJoiningStrategy().tableNameIsInvalid(tableName);
+		return (owner != null) && owner.getRelationship().getPredominantJoiningStrategy().tableNameIsInvalid(tableName);
 	}
 
 	public String getColumnTableNotValidDescription() {
 		// this will not be called if getRelationshipOwner() returns null
-		return this.getRelationshipOwner().getRelationshipReference().getPredominantJoiningStrategy().getColumnTableNotValidDescription();
+		return this.getRelationshipOwner().getRelationship().getPredominantJoiningStrategy().getColumnTableNotValidDescription();
 	}
 
 	protected RelationshipMapping getRelationshipOwner() {
@@ -118,7 +118,7 @@ public class GenericOrmMappedByJoiningStrategy
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public boolean relationshipIsOwnedBy(RelationshipMapping otherMapping) {
@@ -130,7 +130,7 @@ public class GenericOrmMappedByJoiningStrategy
 	}
 
 	protected String getEntityName() {
-		Entity entity = this.getRelationshipReference().getEntity();
+		Entity entity = this.getRelationship().getEntity();
 		return (entity == null) ? null : entity.getName();
 	}
 
@@ -155,7 +155,7 @@ public class GenericOrmMappedByJoiningStrategy
 
 	public TextRange getValidationTextRange() {
 		TextRange mappedByTextRange = this.getXmlMappedByMapping().getMappedByTextRange();
-		return (mappedByTextRange != null) ? mappedByTextRange : this.getRelationshipReference().getValidationTextRange();
+		return (mappedByTextRange != null) ? mappedByTextRange : this.getRelationship().getValidationTextRange();
 	}
 
 	@Override
@@ -183,7 +183,7 @@ public class GenericOrmMappedByJoiningStrategy
 			return;
 		}
 
-		if ( ! this.getRelationshipReference().mayBeMappedBy(mappedByMapping)) {
+		if ( ! this.getRelationship().mayBeMappedBy(mappedByMapping)) {
 			messages.add(
 				this.buildMessage(
 					JpaValidationMessages.MAPPING_INVALID_MAPPED_BY,
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinColumnJoiningStrategy.java
index bce61bd1cd..92783c9917 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -88,7 +88,7 @@ public class GenericOrmMappingJoinColumnJoiningStrategy
 	}
 
 	public TextRange getValidationTextRange() {
-		return this.getRelationshipReference().getValidationTextRange();
+		return this.getRelationship().getValidationTextRange();
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinTableJoiningStrategy.java
index d0910bd94f..3fb7dc67c1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappingJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -43,7 +43,7 @@ public class GenericOrmMappingJoinTableJoiningStrategy
 	}
 
 	public TextRange getValidationTextRange() {
-		return this.getRelationshipReference().getValidationTextRange();
+		return this.getRelationship().getValidationTextRange();
 	}
 
 	protected PersistentAttribute getPersistentAttribute() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyRelationship.java
index 666383eccc..ddcbcec5d7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,25 +12,25 @@ package org.eclipse.jpt.core.internal.context.orm;
 import java.util.List;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmMappedByJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.NullOrmJoinColumnJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToManyRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
 import org.eclipse.jpt.core.resource.orm.XmlOneToMany;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericOrmOneToManyRelationshipReference
+public class GenericOrmOneToManyRelationship
 	extends AbstractOrmMappingRelationship<OrmOneToManyMapping>
-	implements OrmOneToManyRelationshipReference2_0
+	implements OrmOneToManyRelationship2_0
 {
 	protected final OrmMappedByJoiningStrategy mappedByStrategy;
 
@@ -41,7 +41,7 @@ public class GenericOrmOneToManyRelationshipReference
 	protected final OrmJoinColumnJoiningStrategy joinColumnStrategy;
 
 
-	public GenericOrmOneToManyRelationshipReference(OrmOneToManyMapping parent, boolean supportsJoinColumnStrategy) {
+	public GenericOrmOneToManyRelationship(OrmOneToManyMapping parent, boolean supportsJoinColumnStrategy) {
 		super(parent);
 		this.mappedByStrategy = this.buildMappedByStrategy();
 		this.supportsJoinColumnStrategy = supportsJoinColumnStrategy;
@@ -179,26 +179,26 @@ public class GenericOrmOneToManyRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneRelationship.java
index 30753ed82d..8bf4c3f3b2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,25 +12,25 @@ package org.eclipse.jpt.core.internal.context.orm;
 import java.util.List;
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmMappedByJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping;
 import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumnJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneRelationship2_0;
 import org.eclipse.jpt.core.resource.orm.XmlOneToOne;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericOrmOneToOneRelationshipReference
+public class GenericOrmOneToOneRelationship
 	extends AbstractOrmMappingRelationship<OrmOneToOneMapping>
-	implements OrmOneToOneRelationshipReference2_0
+	implements OrmOneToOneRelationship2_0
 {
 	protected final OrmMappedByJoiningStrategy mappedByStrategy;
 
@@ -42,7 +42,7 @@ public class GenericOrmOneToOneRelationshipReference
 	protected final OrmJoinColumnJoiningStrategy joinColumnStrategy;
 
 
-	public GenericOrmOneToOneRelationshipReference(OrmOneToOneMapping parent) {
+	public GenericOrmOneToOneRelationship(OrmOneToOneMapping parent) {
 		super(parent);
 		this.mappedByStrategy = this.buildMappedByStrategy();
 		this.primaryKeyJoinColumnStrategy = this.buildPrimaryKeyJoinColumnStrategy();
@@ -204,7 +204,7 @@ public class GenericOrmOneToOneRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromMappedByRelationship(this);
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
@@ -212,19 +212,19 @@ public class GenericOrmOneToOneRelationshipReference
 	}
 
 	@Override
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		super.initializeFromMappedByRelationship(oldRelationship);
 		this.mappedByStrategy.initializeFrom(oldRelationship.getMappedByJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		super.initializeFromJoinTableRelationship(oldRelationship);
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
 	@Override
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		super.initializeFromJoinColumnRelationship(oldRelationship);
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOverrideJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOverrideJoinColumnJoiningStrategy.java
index f48a4c8562..6ed10e862c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOverrideJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOverrideJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmOverrideRelationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumn.Owner;
 import org.eclipse.jpt.core.internal.context.BaseColumnTextRangeResolver;
@@ -31,7 +31,7 @@ import org.eclipse.jpt.db.Table;
 public class GenericOrmOverrideJoinColumnJoiningStrategy
 	extends AbstractOrmJoinColumnJoiningStrategy
 {
-	public GenericOrmOverrideJoinColumnJoiningStrategy(OrmAssociationOverrideRelationshipReference parent) {
+	public GenericOrmOverrideJoinColumnJoiningStrategy(OrmOverrideRelationship parent) {
 		super(parent);
 	}
 
@@ -43,7 +43,7 @@ public class GenericOrmOverrideJoinColumnJoiningStrategy
 	public boolean isTargetForeignKey() {
 		RelationshipMapping relationshipMapping = this.getRelationshipMapping();
 		return (relationshipMapping != null) &&
-				relationshipMapping.getRelationshipReference().isTargetForeignKey();
+				relationshipMapping.getRelationship().isTargetForeignKey();
 	}
 
 	public TypeMapping getRelationshipSource() {
@@ -114,7 +114,7 @@ public class GenericOrmOverrideJoinColumnJoiningStrategy
 	}
 
 	protected OrmAssociationOverride getAssociationOverride() {
-		return this.getRelationshipReference().getAssociationOverride();
+		return this.getRelationship().getAssociationOverride();
 	}
 
 	protected AssociationOverrideContainer getAssociationOverrideContainer() {
@@ -122,12 +122,12 @@ public class GenericOrmOverrideJoinColumnJoiningStrategy
 	}
 
 	@Override
-	public OrmAssociationOverrideRelationshipReference getRelationshipReference() {
-		return (OrmAssociationOverrideRelationshipReference) super.getRelationshipReference();
+	public OrmOverrideRelationship getRelationship() {
+		return (OrmOverrideRelationship) super.getRelationship();
 	}
 
 	public TextRange getValidationTextRange() {
-		return this.getRelationshipReference().getValidationTextRange();
+		return this.getRelationship().getValidationTextRange();
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnJoiningStrategy.java
index 20a40689b8..f8316488f3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
 import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumnRelationship;
 import org.eclipse.jpt.core.context.orm.OrmPrimaryKeyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.BaseJoinColumnTextRangeResolver;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
@@ -51,7 +51,7 @@ public class GenericOrmPrimaryKeyJoinColumnJoiningStrategy
 	protected final OrmJoinColumn.Owner primaryKeyJoinColumnOwner;
 
 
-	public GenericOrmPrimaryKeyJoinColumnJoiningStrategy(OrmPrimaryKeyJoinColumnEnabledRelationshipReference parent) {
+	public GenericOrmPrimaryKeyJoinColumnJoiningStrategy(OrmPrimaryKeyJoinColumnRelationship parent) {
 		super(parent);
 		this.primaryKeyJoinColumnContainerAdapter = this.buildPrimaryKeyJoinColumnContainerAdapter();
 		this.primaryKeyJoinColumnOwner = this.buildPrimaryKeyJoinColumnOwner();
@@ -200,20 +200,20 @@ public class GenericOrmPrimaryKeyJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmPrimaryKeyJoinColumnEnabledRelationshipReference getParent() {
-		return (OrmPrimaryKeyJoinColumnEnabledRelationshipReference) super.getParent();
+	public OrmPrimaryKeyJoinColumnRelationship getParent() {
+		return (OrmPrimaryKeyJoinColumnRelationship) super.getParent();
 	}
 
-	public OrmPrimaryKeyJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public OrmPrimaryKeyJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	protected XmlPrimaryKeyJoinColumnContainer getXmlPrimaryKeyJoinColumnContainer() {
-		return this.getRelationshipReference().getXmlContainer();
+		return this.getRelationship().getXmlContainer();
 	}
 
 	public String getTableName() {
@@ -256,7 +256,7 @@ public class GenericOrmPrimaryKeyJoinColumnJoiningStrategy
 	// ********** validation **********
 
 	public TextRange getValidationTextRange() {
-		return this.getRelationshipReference().getValidationTextRange();
+		return this.getRelationship().getValidationTextRange();
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualJoinTable.java
index 48b0e0ec1f..53b3110379 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualJoinTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumn;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTable;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTableJoiningStrategy;
-import org.eclipse.jpt.core.context.orm.OrmVirtualRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualRelationship;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.utility.internal.CollectionTools;
@@ -227,7 +227,7 @@ public class GenericOrmVirtualJoinTable
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getJoinStrategy().getRelationshipReference().getMapping();
+		return this.getJoinStrategy().getRelationship().getMapping();
 	}
 
 	public PersistentAttribute getPersistentAttribute() {
@@ -248,7 +248,7 @@ public class GenericOrmVirtualJoinTable
 		}
 
 		public TypeMapping getTypeMapping() {
-			return this.getRelationshipReference().getTypeMapping();
+			return this.getRelationship().getTypeMapping();
 		}
 
 		/**
@@ -266,8 +266,8 @@ public class GenericOrmVirtualJoinTable
 			throw new UnsupportedOperationException();
 		}
 
-		protected OrmVirtualRelationshipReference getRelationshipReference() {
-			return GenericOrmVirtualJoinTable.this.getJoinStrategy().getRelationshipReference();
+		protected OrmVirtualRelationship getRelationship() {
+			return GenericOrmVirtualJoinTable.this.getJoinStrategy().getRelationship();
 		}
 	}
 
@@ -284,7 +284,7 @@ public class GenericOrmVirtualJoinTable
 		}
 
 		public Entity getRelationshipTarget() {
-			return this.getRelationshipReference().getEntity();
+			return this.getRelationship().getEntity();
 		}
 
 		public String getAttributeName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnJoiningStrategy.java
index 8643633863..b8833c726f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -13,18 +13,18 @@ import java.util.ListIterator;
 import java.util.Vector;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.JoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.JoinColumnRelationship;
 import org.eclipse.jpt.core.context.JoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideContainer;
 import org.eclipse.jpt.core.context.orm.OrmReadOnlyAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualOverrideRelationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumnRelationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.utility.TextRange;
@@ -46,7 +46,7 @@ public class GenericOrmVirtualOverrideJoinColumnJoiningStrategy
 	protected OrmVirtualJoinColumn defaultJoinColumn;
 
 
-	public GenericOrmVirtualOverrideJoinColumnJoiningStrategy(OrmVirtualJoinColumnEnabledRelationshipReference parent) {
+	public GenericOrmVirtualOverrideJoinColumnJoiningStrategy(OrmVirtualJoinColumnRelationship parent) {
 		super(parent);
 		this.specifiedJoinColumnContainerAdapter = this.buildSpecifiedJoinColumnContainerAdapter();
 		this.joinColumnOwner = this.buildJoinColumnOwner();
@@ -206,32 +206,32 @@ public class GenericOrmVirtualOverrideJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmVirtualJoinColumnEnabledRelationshipReference getParent() {
-		return (OrmVirtualJoinColumnEnabledRelationshipReference) super.getParent();
+	public OrmVirtualJoinColumnRelationship getParent() {
+		return (OrmVirtualJoinColumnRelationship) super.getParent();
 	}
 
-	public OrmVirtualJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public OrmVirtualJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected JoinColumnJoiningStrategy getOverriddenStrategy() {
-		JoinColumnEnabledRelationshipReference relationship = this.getOverriddenJoinColumnRelationship();
+		JoinColumnRelationship relationship = this.getOverriddenJoinColumnRelationship();
 		return (relationship == null) ? null : relationship.getJoinColumnJoiningStrategy();
 	}
 
-	protected JoinColumnEnabledRelationshipReference getOverriddenJoinColumnRelationship() {
-		RelationshipReference relationship = this.resolveOverriddenRelationship();
-		return (relationship instanceof JoinColumnEnabledRelationshipReference) ? (JoinColumnEnabledRelationshipReference) relationship : null;
+	protected JoinColumnRelationship getOverriddenJoinColumnRelationship() {
+		Relationship relationship = this.resolveOverriddenRelationship();
+		return (relationship instanceof JoinColumnRelationship) ? (JoinColumnRelationship) relationship : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship() {
-		return this.getRelationshipReference().resolveOverriddenRelationship();
+	protected Relationship resolveOverriddenRelationship() {
+		return this.getRelationship().resolveOverriddenRelationship();
 	}
 
 	public boolean isTargetForeignKey() {
 		RelationshipMapping relationshipMapping = this.getRelationshipMapping();
 		return (relationshipMapping != null) &&
-				relationshipMapping.getRelationshipReference().isTargetForeignKey();
+				relationshipMapping.getRelationship().isTargetForeignKey();
 	}
 
 	public TypeMapping getRelationshipSource() {
@@ -261,7 +261,7 @@ public class GenericOrmVirtualOverrideJoinColumnJoiningStrategy
 	}
 
 	protected OrmReadOnlyAssociationOverride getAssociationOverride() {
-		return ((OrmVirtualAssociationOverrideRelationshipReference) this.getRelationshipReference()).getAssociationOverride();
+		return ((OrmVirtualOverrideRelationship) this.getRelationship()).getAssociationOverride();
 	}
 
 	protected OrmAssociationOverrideContainer getAssociationOverrideContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/NullOrmJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/NullOrmJoinTableJoiningStrategy.java
index 611e7e06c4..f92927ff95 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/NullOrmJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/NullOrmJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.context.orm;
 import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.orm.OrmJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmJoinTableRelationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.JoinColumnTextRangeResolver;
 import org.eclipse.jpt.core.internal.context.JptValidator;
@@ -25,7 +25,7 @@ public class NullOrmJoinTableJoiningStrategy
 	extends AbstractOrmXmlContextNode
 	implements OrmJoinTableJoiningStrategy
 {
-	public NullOrmJoinTableJoiningStrategy(OrmJoinTableEnabledRelationshipReference parent) {
+	public NullOrmJoinTableJoiningStrategy(OrmJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -74,11 +74,11 @@ public class NullOrmJoinTableJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmJoinTableEnabledRelationshipReference getParent() {
-		return (OrmJoinTableEnabledRelationshipReference) super.getParent();
+	public OrmJoinTableRelationship getParent() {
+		return (OrmJoinTableRelationship) super.getParent();
 	}
 
-	public OrmJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public OrmJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java
index 001eda44ec..a8a0c92ccd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,7 +16,7 @@ import org.eclipse.jpt.core.context.ReadOnlyAssociationOverride;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
-import org.eclipse.jpt.core.context.java.JavaAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaOverrideRelationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverride;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaOverride;
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
@@ -31,12 +31,12 @@ public class GenericJavaAssociationOverride
 	extends AbstractJavaOverride<JavaAssociationOverrideContainer, AssociationOverrideAnnotation>
 	implements JavaAssociationOverride
 {
-	protected final JavaAssociationOverrideRelationshipReference relationship;
+	protected final JavaOverrideRelationship relationship;
 
 
 	public GenericJavaAssociationOverride(JavaAssociationOverrideContainer parent, AssociationOverrideAnnotation annotation) {
 		super(parent, annotation);
-		this.relationship = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 	}
 
 
@@ -65,12 +65,12 @@ public class GenericJavaAssociationOverride
 
 	// ********** relationship **********
 
-	public JavaAssociationOverrideRelationshipReference getRelationshipReference() {
+	public JavaOverrideRelationship getRelationship() {
 		return this.relationship;
 	}
 
-	protected JavaAssociationOverrideRelationshipReference buildRelationshipReference() {
-		return this.getJpaFactory().buildJavaAssociationOverrideRelationshipReference(this);
+	protected JavaOverrideRelationship buildRelationship() {
+		return this.getJpaFactory().buildJavaOverrideRelationship(this);
 	}
 
 
@@ -82,12 +82,12 @@ public class GenericJavaAssociationOverride
 
 	public void initializeFrom(ReadOnlyAssociationOverride oldOverride) {
 		super.initializeFrom(oldOverride);
-		this.relationship.initializeFrom(oldOverride.getRelationshipReference());
+		this.relationship.initializeFrom(oldOverride.getRelationship());
 	}
 
 	public void initializeFromVirtual(ReadOnlyAssociationOverride virtualOverride) {
 		super.initializeFromVirtual(virtualOverride);
-		this.relationship.initializeFromVirtual(virtualOverride.getRelationshipReference());
+		this.relationship.initializeFromVirtual(virtualOverride.getRelationship());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java
index 63e24e8c34..1e5ad46ec0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.jpa1.context.java;
 import org.eclipse.jpt.core.context.AssociationOverride;
 import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
@@ -48,7 +48,7 @@ public class GenericJavaAssociationOverrideContainer
 		return MappingTools.getRelationshipMapping(attributeName, this.owner.getOverridableTypeMapping());
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String associationOverrideName) {
+	public Relationship resolveOverriddenRelationship(String associationOverrideName) {
 		return this.owner.resolveOverriddenRelationship(associationOverrideName);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java
index d4510b0e31..7c9db8f645 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.JoinTable;
 import org.eclipse.jpt.core.context.OverrideContainer;
 import org.eclipse.jpt.core.context.Override_;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
@@ -156,21 +156,21 @@ public class GenericJavaEmbeddedMapping
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		return this.isJpa2_0Compatible() ? this.resolveOverriddenRelationship_(attributeName) : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship_(String attributeName) {
+	protected Relationship resolveOverriddenRelationship_(String attributeName) {
 		attributeName = this.unqualify(attributeName);
 		if (attributeName == null) {
 			return null;
 		}
 		AssociationOverride override = this.associationOverrideContainer.getSpecifiedOverrideNamed(attributeName);
 		// recurse into the target embeddable if necessary
-		return (override != null) ? override.getRelationshipReference() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
+		return (override != null) ? override.getRelationship() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
 	}
 
-	protected RelationshipReference resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
+	protected Relationship resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
 		return (this.targetEmbeddable == null) ? null : this.targetEmbeddable.resolveOverriddenRelationship(attributeName);
 	}
 
@@ -224,7 +224,7 @@ public class GenericJavaEmbeddedMapping
 			return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinTable.java
index af306edcf8..bfbcd9371c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaJoinTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -317,7 +317,7 @@ public class GenericJavaJoinTable
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getJoinStrategy().getRelationshipReference().getMapping();
+		return this.getJoinStrategy().getRelationship().getMapping();
 	}
 
 	public PersistentAttribute getPersistentAttribute() {
@@ -369,7 +369,7 @@ public class GenericJavaJoinTable
 		}
 
 		public TypeMapping getTypeMapping() {
-			return GenericJavaJoinTable.this.getJoinStrategy().getRelationshipReference().getTypeMapping();
+			return GenericJavaJoinTable.this.getJoinStrategy().getRelationship().getTypeMapping();
 		}
 
 		public PersistentAttribute getPersistentAttribute() {
@@ -430,7 +430,7 @@ public class GenericJavaJoinTable
 		}
 
 		public Entity getRelationshipTarget() {
-			return GenericJavaJoinTable.this.getJoinStrategy().getRelationshipReference().getEntity();
+			return GenericJavaJoinTable.this.getJoinStrategy().getRelationship().getEntity();
 		}
 
 		public String getAttributeName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaMappingJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaMappingJoinTableJoiningStrategy.java
index d8589a069b..54fbb8a321 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaMappingJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaMappingJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -55,7 +55,7 @@ public class GenericJavaMappingJoinTableJoiningStrategy
 	// ********** misc **********
 
 	protected JavaResourcePersistentAttribute getResourcePersistentAttribute() {
-		return this.getRelationshipReference().getMapping().getResourcePersistentAttribute();
+		return this.getRelationship().getMapping().getResourcePersistentAttribute();
 	}
 
 	@Override
@@ -64,7 +64,7 @@ public class GenericJavaMappingJoinTableJoiningStrategy
 	}
 
 	@Override
-	public JavaMappingJoinTableRelationship getRelationshipReference() {
+	public JavaMappingJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
@@ -80,7 +80,7 @@ public class GenericJavaMappingJoinTableJoiningStrategy
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getRelationshipReference().getValidationTextRange(astRoot);
+		return this.getRelationship().getValidationTextRange(astRoot);
 	}
 
 	public JptValidator buildTableValidator(Table table, TableTextRangeResolver textRangeResolver) {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java
index dd3333f778..970286f031 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaAssociationOverrideRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,15 +12,15 @@ package org.eclipse.jpt.core.internal.jpa1.context.java;
 import java.util.Iterator;
 import java.util.List;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.AssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.OverrideRelationship;
 import org.eclipse.jpt.core.context.Entity;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyAssociationOverrideRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyOverrideRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
@@ -29,15 +29,15 @@ import org.eclipse.jpt.core.context.java.JavaJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
 import org.eclipse.jpt.core.internal.context.java.GenericJavaOverrideJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa2.context.java.GenericJavaOverrideJoinTableJoiningStrategy2_0;
-import org.eclipse.jpt.core.jpa2.context.java.JavaAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaOverrideRelationship2_0;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericJavaAssociationOverrideRelationshipReference
+public class GenericJavaOverrideRelationship
 	extends AbstractJavaJpaContextNode
-	implements JavaAssociationOverrideRelationshipReference2_0
+	implements JavaOverrideRelationship2_0
 {
 	protected JavaJoiningStrategy strategy;
 
@@ -47,7 +47,7 @@ public class GenericJavaAssociationOverrideRelationshipReference
 	protected final JavaJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericJavaAssociationOverrideRelationshipReference(JavaAssociationOverride parent) {
+	public GenericJavaOverrideRelationship(JavaAssociationOverride parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -147,40 +147,40 @@ public class GenericJavaAssociationOverrideRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeFrom(ReadOnlyRelationshipReference oldRelationship) {
+	public void initializeFrom(ReadOnlyRelationship oldRelationship) {
 		oldRelationship.initializeOn(this);
 	}
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
 
-	public void initializeFromVirtual(ReadOnlyAssociationOverrideRelationshipReference virtualRelationship) {
+	public void initializeFromVirtual(ReadOnlyOverrideRelationship virtualRelationship) {
 		virtualRelationship.initializeOnSpecified(this);
 	}
 
-	public void initializeOnSpecified(AssociationOverrideRelationshipReference specifiedRelationship) {
+	public void initializeOnSpecified(OverrideRelationship specifiedRelationship) {
 		throw new UnsupportedOperationException();
 	}
 
-	public void initializeFromVirtualJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference virtualRelationship) {
+	public void initializeFromVirtualJoinTableRelationship(ReadOnlyJoinTableRelationship virtualRelationship) {
 		this.joinTableStrategy.initializeFromVirtual(virtualRelationship.getJoinTableJoiningStrategy());
 	}
 
-	public void initializeFromVirtualJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference virtualRelationship) {
+	public void initializeFromVirtualJoinColumnRelationship(ReadOnlyJoinColumnRelationship virtualRelationship) {
 		this.joinColumnStrategy.initializeFromVirtual(virtualRelationship.getJoinColumnJoiningStrategy());
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java
index bc91c07078..f3c8542c7c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,11 +10,11 @@
 package org.eclipse.jpt.core.internal.jpa1.context.java;
 
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
 import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualOverrideRelationship;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaVirtualOverride;
 
 /**
@@ -24,12 +24,12 @@ public class GenericJavaVirtualAssociationOverride
 	extends AbstractJavaVirtualOverride<JavaAssociationOverrideContainer>
 	implements JavaVirtualAssociationOverride
 {
-	protected final JavaVirtualAssociationOverrideRelationshipReference relationship;
+	protected final JavaVirtualOverrideRelationship relationship;
 
 
 	public GenericJavaVirtualAssociationOverride(JavaAssociationOverrideContainer parent, String name) {
 		super(parent, name);
-		this.relationship = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 	}
 
 	@Override
@@ -50,7 +50,7 @@ public class GenericJavaVirtualAssociationOverride
 
 	// ********** relationship **********
 
-	public JavaVirtualAssociationOverrideRelationshipReference getRelationshipReference() {
+	public JavaVirtualOverrideRelationship getRelationship() {
 		return this.relationship;
 	}
 
@@ -58,11 +58,11 @@ public class GenericJavaVirtualAssociationOverride
 	 * The relationship should be available (since its presence precipitated the
 	 * creation of the virtual override).
 	 */
-	protected JavaVirtualAssociationOverrideRelationshipReference buildRelationshipReference() {
-		return this.getJpaFactory().buildJavaVirtualAssociationOverrideRelationshipReference(this);
+	protected JavaVirtualOverrideRelationship buildRelationship() {
+		return this.getJpaFactory().buildJavaVirtualOverrideRelationship(this);
 	}
 
-	public RelationshipReference resolveOverriddenRelationship() {
+	public Relationship resolveOverriddenRelationship() {
 		return this.getContainer().resolveOverriddenRelationship(this.name);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnJoiningStrategy.java
index c2f55b0442..0d04333541 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,18 +14,18 @@ import java.util.Vector;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.JoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.JoinColumnRelationship;
 import org.eclipse.jpt.core.context.JoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.ReadOnlyBaseJoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyJoinColumn;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
 import org.eclipse.jpt.core.context.java.JavaReadOnlyAssociationOverride;
-import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualOverrideRelationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumnRelationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.ContextContainerTools;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
@@ -48,7 +48,7 @@ public class GenericJavaVirtualOverrideJoinColumnJoiningStrategy
 	protected JavaVirtualJoinColumn defaultJoinColumn;
 
 
-	public GenericJavaVirtualOverrideJoinColumnJoiningStrategy(JavaVirtualJoinColumnEnabledRelationshipReference parent) {
+	public GenericJavaVirtualOverrideJoinColumnJoiningStrategy(JavaVirtualJoinColumnRelationship parent) {
 		super(parent);
 		this.specifiedJoinColumnContainerAdapter = this.buildSpecifiedJoinColumnContainerAdapter();
 		this.joinColumnOwner = this.buildJoinColumnOwner();
@@ -208,32 +208,32 @@ public class GenericJavaVirtualOverrideJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaVirtualJoinColumnEnabledRelationshipReference getParent() {
-		return (JavaVirtualJoinColumnEnabledRelationshipReference) super.getParent();
+	public JavaVirtualJoinColumnRelationship getParent() {
+		return (JavaVirtualJoinColumnRelationship) super.getParent();
 	}
 
-	public JavaVirtualJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public JavaVirtualJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected JoinColumnJoiningStrategy getOverriddenStrategy() {
-		JoinColumnEnabledRelationshipReference relationship = this.getOverriddenJoinColumnRelationship();
+		JoinColumnRelationship relationship = this.getOverriddenJoinColumnRelationship();
 		return (relationship == null) ? null : relationship.getJoinColumnJoiningStrategy();
 	}
 
-	protected JoinColumnEnabledRelationshipReference getOverriddenJoinColumnRelationship() {
-		RelationshipReference relationship = this.resolveOverriddenRelationship();
-		return (relationship instanceof JoinColumnEnabledRelationshipReference) ? (JoinColumnEnabledRelationshipReference) relationship : null;
+	protected JoinColumnRelationship getOverriddenJoinColumnRelationship() {
+		Relationship relationship = this.resolveOverriddenRelationship();
+		return (relationship instanceof JoinColumnRelationship) ? (JoinColumnRelationship) relationship : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship() {
-		return this.getRelationshipReference().resolveOverriddenRelationship();
+	protected Relationship resolveOverriddenRelationship() {
+		return this.getRelationship().resolveOverriddenRelationship();
 	}
 
 	public boolean isTargetForeignKey() {
 		RelationshipMapping relationshipMapping = this.getRelationshipMapping();
 		return (relationshipMapping != null) &&
-				relationshipMapping.getRelationshipReference().isTargetForeignKey();
+				relationshipMapping.getRelationship().isTargetForeignKey();
 	}
 
 	public TypeMapping getRelationshipSource() {
@@ -263,7 +263,7 @@ public class GenericJavaVirtualOverrideJoinColumnJoiningStrategy
 	}
 
 	protected JavaReadOnlyAssociationOverride getAssociationOverride() {
-		return ((JavaVirtualAssociationOverrideRelationshipReference) this.getRelationshipReference()).getAssociationOverride();
+		return ((JavaVirtualOverrideRelationship) this.getRelationship()).getAssociationOverride();
 	}
 
 	protected JavaAssociationOverrideContainer getAssociationOverrideContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverrideRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java
index d4b3c97155..a1295aeb8a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverrideRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,10 +10,10 @@
 package org.eclipse.jpt.core.internal.jpa1.context.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jpt.core.context.AssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.OverrideRelationship;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaVirtualAssociationOverride;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinColumnJoiningStrategy;
@@ -21,12 +21,12 @@ import org.eclipse.jpt.core.context.java.JavaVirtualJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
 import org.eclipse.jpt.core.internal.jpa2.context.java.GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0;
-import org.eclipse.jpt.core.jpa2.context.java.JavaVirtualAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaVirtualOverrideRelationship2_0;
 import org.eclipse.jpt.core.utility.TextRange;
 
-public class GenericJavaVirtualAssociationOverrideRelationshipReference
+public class GenericJavaVirtualOverrideRelationship
 	extends AbstractJavaJpaContextNode
-	implements JavaVirtualAssociationOverrideRelationshipReference2_0
+	implements JavaVirtualOverrideRelationship2_0
 {
 	protected JavaVirtualJoiningStrategy strategy;
 
@@ -36,7 +36,7 @@ public class GenericJavaVirtualAssociationOverrideRelationshipReference
 	protected final JavaVirtualJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericJavaVirtualAssociationOverrideRelationshipReference(JavaVirtualAssociationOverride parent) {
+	public GenericJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -117,12 +117,12 @@ public class GenericJavaVirtualAssociationOverrideRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
-	public void initializeOnSpecified(AssociationOverrideRelationshipReference specifiedRelationship) {
+	public void initializeOnSpecified(OverrideRelationship specifiedRelationship) {
 		specifiedRelationship.initializeFromVirtualJoinColumnRelationship(this);
 		specifiedRelationship.initializeFromVirtualJoinTableRelationship(this);
 	}
@@ -156,7 +156,7 @@ public class GenericJavaVirtualAssociationOverrideRelationshipReference
 		return this.getAssociationOverride().getMapping();
 	}
 
-	public RelationshipReference resolveOverriddenRelationship() {
+	public Relationship resolveOverriddenRelationship() {
 		return this.getAssociationOverride().resolveOverriddenRelationship();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinColumnJoiningStrategy.java
index 2010bd2fab..60300cce1d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,7 +16,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaJoinColumn;
-import org.eclipse.jpt.core.context.java.JavaJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaJoinColumnRelationship;
 import org.eclipse.jpt.core.context.java.JavaJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
 import org.eclipse.jpt.core.utility.TextRange;
@@ -32,7 +32,7 @@ public class NullJavaJoinColumnJoiningStrategy
 	extends AbstractJavaJpaContextNode
 	implements JavaJoinColumnJoiningStrategy
 {
-	public NullJavaJoinColumnJoiningStrategy(JavaJoinColumnEnabledRelationshipReference parent) {
+	public NullJavaJoinColumnJoiningStrategy(JavaJoinColumnRelationship parent) {
 		super(parent);
 	}
 
@@ -97,16 +97,16 @@ public class NullJavaJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaJoinColumnEnabledRelationshipReference getParent() {
-		return (JavaJoinColumnEnabledRelationshipReference) super.getParent();
+	public JavaJoinColumnRelationship getParent() {
+		return (JavaJoinColumnRelationship) super.getParent();
 	}
 
-	public JavaJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public JavaJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 
 	public String getTableName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinTableJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinTableJoiningStrategy.java
index e4808d5dbf..a714e24f1d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinTableJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/java/NullJavaJoinTableJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.ReadOnlyJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.context.JoinColumn.Owner;
 import org.eclipse.jpt.core.context.java.JavaJoinTable;
-import org.eclipse.jpt.core.context.java.JavaJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaJoinTableRelationship;
 import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.JoinColumnTextRangeResolver;
 import org.eclipse.jpt.core.internal.context.JptValidator;
@@ -27,7 +27,7 @@ public class NullJavaJoinTableJoiningStrategy
 	extends AbstractJavaJpaContextNode
 	implements JavaJoinTableJoiningStrategy
 {
-	public NullJavaJoinTableJoiningStrategy(JavaJoinTableEnabledRelationshipReference parent) {
+	public NullJavaJoinTableJoiningStrategy(JavaJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -53,11 +53,11 @@ public class NullJavaJoinTableJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public JavaJoinTableEnabledRelationshipReference getParent() {
-		return (JavaJoinTableEnabledRelationshipReference) super.getParent();
+	public JavaJoinTableRelationship getParent() {
+		return (JavaJoinTableRelationship) super.getParent();
 	}
 
-	public JavaJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public JavaJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
index 97d1b47d49..063f8272a7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.ReadOnlyAssociationOverride;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideContainer;
-import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmOverrideRelationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverride;
 import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
@@ -27,12 +27,12 @@ public class GenericOrmAssociationOverride
 	extends AbstractOrmOverride<OrmAssociationOverrideContainer, XmlAssociationOverride>
 	implements OrmAssociationOverride
 {
-	protected final OrmAssociationOverrideRelationshipReference relationship;
+	protected final OrmOverrideRelationship relationship;
 
 
 	public GenericOrmAssociationOverride(OrmAssociationOverrideContainer parent, XmlAssociationOverride xmlOverride) {
 		super(parent, xmlOverride);
-		this.relationship = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 	}
 
 
@@ -61,12 +61,12 @@ public class GenericOrmAssociationOverride
 
 	// ********** relationship **********
 
-	public OrmAssociationOverrideRelationshipReference getRelationshipReference() {
+	public OrmOverrideRelationship getRelationship() {
 		return this.relationship;
 	}
 
-	protected OrmAssociationOverrideRelationshipReference buildRelationshipReference() {
-		return this.getContextNodeFactory().buildOrmAssociationOverrideRelationshipReference(this);
+	protected OrmOverrideRelationship buildRelationship() {
+		return this.getContextNodeFactory().buildOrmOverrideRelationship(this);
 	}
 
 
@@ -78,12 +78,12 @@ public class GenericOrmAssociationOverride
 
 	public void initializeFrom(ReadOnlyAssociationOverride oldOverride) {
 		super.initializeFrom(oldOverride);
-		this.relationship.initializeFrom(oldOverride.getRelationshipReference());
+		this.relationship.initializeFrom(oldOverride.getRelationship());
 	}
 
 	public void initializeFromVirtual(ReadOnlyAssociationOverride virtualOverride) {
 		super.initializeFromVirtual(virtualOverride);
-		this.relationship.initializeFromVirtual(virtualOverride.getRelationshipReference());
+		this.relationship.initializeFromVirtual(virtualOverride.getRelationship());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
index 4baa9b129c..77f80f150b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.jpa1.context.orm;
 import org.eclipse.jpt.core.context.AssociationOverride;
 import org.eclipse.jpt.core.context.JoinColumn;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
@@ -49,7 +49,7 @@ public class GenericOrmAssociationOverrideContainer
 		return MappingTools.getRelationshipMapping(attributeName, this.owner.getOverridableTypeMapping());
 	}
 
-	public RelationshipReference resolveOverriddenRelationship(String associationOverrideName) {
+	public Relationship resolveOverriddenRelationship(String associationOverrideName) {
 		return this.owner.resolveOverriddenRelationship(associationOverrideName);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
index 5bc84ed311..6c6dd81b76 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.context.JoinTable;
 import org.eclipse.jpt.core.context.OverrideContainer;
 import org.eclipse.jpt.core.context.Override_;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
@@ -199,21 +199,21 @@ public class GenericOrmEmbeddedMapping
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		return this.isJpa2_0Compatible() ? this.resolveOverriddenRelationship_(attributeName) : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship_(String attributeName) {
+	protected Relationship resolveOverriddenRelationship_(String attributeName) {
 		attributeName = this.unqualify(attributeName);
 		if (attributeName == null) {
 			return null;
 		}
 		AssociationOverride override = this.associationOverrideContainer.getSpecifiedOverrideNamed(attributeName);
 		// recurse into the target embeddable if necessary
-		return (override != null) ? override.getRelationshipReference() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
+		return (override != null) ? override.getRelationship() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
 	}
 
-	protected RelationshipReference resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
+	protected Relationship resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
 		return (this.targetEmbeddable == null) ? null : this.targetEmbeddable.resolveOverriddenRelationship(attributeName);
 	}
 
@@ -253,7 +253,7 @@ public class GenericOrmEmbeddedMapping
 			return GenericOrmEmbeddedMapping.this.getXmlAttributeMapping().getAssociationOverrides();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
index 829413cf04..3afdde8319 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -322,7 +322,7 @@ public class GenericOrmJoinTable
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
-		return this.getJoinStrategy().getRelationshipReference().getMapping();
+		return this.getJoinStrategy().getRelationship().getMapping();
 	}
 
 	public PersistentAttribute getPersistentAttribute() {
@@ -356,7 +356,7 @@ public class GenericOrmJoinTable
 		}
 
 		public TypeMapping getTypeMapping() {
-			return GenericOrmJoinTable.this.getJoinStrategy().getRelationshipReference().getTypeMapping();
+			return GenericOrmJoinTable.this.getJoinStrategy().getRelationship().getTypeMapping();
 		}
 
 		protected PersistentAttribute getPersistentAttribute() {
@@ -429,7 +429,7 @@ public class GenericOrmJoinTable
 		}
 
 		public Entity getRelationshipTarget() {
-			return this.getJoinStrategy().getRelationshipReference().getEntity();
+			return this.getJoinStrategy().getRelationship().getEntity();
 		}
 
 		public String getAttributeName() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
index 9c9d77466d..676e38b545 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,16 +10,16 @@
 package org.eclipse.jpt.core.internal.jpa1.context.orm;
 
 import java.util.List;
-import org.eclipse.jpt.core.context.AssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.OverrideRelationship;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.core.context.OwnableRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyAssociationOverrideRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinColumnEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyJoinTableEnabledRelationshipReference;
-import org.eclipse.jpt.core.context.ReadOnlyRelationshipReference;
+import org.eclipse.jpt.core.context.MappedByRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyOverrideRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinColumnRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyJoinTableRelationship;
+import org.eclipse.jpt.core.context.ReadOnlyRelationship;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
@@ -33,15 +33,15 @@ import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
 import org.eclipse.jpt.core.internal.context.orm.GenericOrmOverrideJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.orm.NullOrmJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa2.context.orm.GenericOrmOverrideJoinTableJoiningStrategy2_0;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOverrideRelationship2_0;
 import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IReporter;
 
-public class GenericOrmAssociationOverrideRelationshipReference
+public class GenericOrmOverrideRelationship
 	extends AbstractOrmXmlContextNode
-	implements OrmAssociationOverrideRelationshipReference2_0
+	implements OrmOverrideRelationship2_0
 {
 	protected OrmJoiningStrategy strategy;
 
@@ -51,7 +51,7 @@ public class GenericOrmAssociationOverrideRelationshipReference
 	protected final OrmJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericOrmAssociationOverrideRelationshipReference(OrmAssociationOverride parent) {
+	public GenericOrmOverrideRelationship(OrmAssociationOverride parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -151,40 +151,40 @@ public class GenericOrmAssociationOverrideRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeFrom(ReadOnlyRelationshipReference oldRelationship) {
+	public void initializeFrom(ReadOnlyRelationship oldRelationship) {
 		oldRelationship.initializeOn(this);
 	}
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
-	public void initializeFromMappedByRelationship(OwnableRelationshipReference oldRelationship) {
+	public void initializeFromMappedByRelationship(MappedByRelationship oldRelationship) {
 		// NOP
 	}
 
-	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinTableRelationship(ReadOnlyJoinTableRelationship oldRelationship) {
 		this.joinTableStrategy.initializeFrom(oldRelationship.getJoinTableJoiningStrategy());
 	}
 
-	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference oldRelationship) {
+	public void initializeFromJoinColumnRelationship(ReadOnlyJoinColumnRelationship oldRelationship) {
 		this.joinColumnStrategy.initializeFrom(oldRelationship.getJoinColumnJoiningStrategy());
 	}
 
-	public void initializeFromVirtual(ReadOnlyAssociationOverrideRelationshipReference virtualRelationship) {
+	public void initializeFromVirtual(ReadOnlyOverrideRelationship virtualRelationship) {
 		virtualRelationship.initializeOnSpecified(this);
 	}
 
-	public void initializeOnSpecified(AssociationOverrideRelationshipReference specifiedRelationship) {
+	public void initializeOnSpecified(OverrideRelationship specifiedRelationship) {
 		throw new UnsupportedOperationException();
 	}
 
-	public void initializeFromVirtualJoinTableRelationship(ReadOnlyJoinTableEnabledRelationshipReference virtualRelationship) {
+	public void initializeFromVirtualJoinTableRelationship(ReadOnlyJoinTableRelationship virtualRelationship) {
 		this.joinTableStrategy.initializeFromVirtual(virtualRelationship.getJoinTableJoiningStrategy());
 	}
 
-	public void initializeFromVirtualJoinColumnRelationship(ReadOnlyJoinColumnEnabledRelationshipReference virtualRelationship) {
+	public void initializeFromVirtualJoinColumnRelationship(ReadOnlyJoinColumnRelationship virtualRelationship) {
 		this.joinColumnStrategy.initializeFromVirtual(virtualRelationship.getJoinColumnJoiningStrategy());
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
index e101425bc7..8f66c06cef 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,11 +10,11 @@
 package org.eclipse.jpt.core.internal.jpa1.context.orm;
 
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverride;
 import org.eclipse.jpt.core.context.orm.OrmAssociationOverrideContainer;
 import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverride;
-import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualOverrideRelationship;
 
 /**
  * Virtual <code>orm.xml</code> association override
@@ -23,12 +23,12 @@ public class GenericOrmVirtualAssociationOverride
 	extends AbstractOrmVirtualOverride<OrmAssociationOverrideContainer>
 	implements OrmVirtualAssociationOverride
 {
-	protected final OrmVirtualAssociationOverrideRelationshipReference relationship;
+	protected final OrmVirtualOverrideRelationship relationship;
 
 
 	public GenericOrmVirtualAssociationOverride(OrmAssociationOverrideContainer parent, String name) {
 		super(parent, name);
-		this.relationship = this.buildRelationshipReference();
+		this.relationship = this.buildRelationship();
 	}
 
 	@Override
@@ -49,7 +49,7 @@ public class GenericOrmVirtualAssociationOverride
 
 	// ********** relationship **********
 
-	public OrmVirtualAssociationOverrideRelationshipReference getRelationshipReference() {
+	public OrmVirtualOverrideRelationship getRelationship() {
 		return this.relationship;
 	}
 
@@ -57,11 +57,11 @@ public class GenericOrmVirtualAssociationOverride
 	 * The relationship should be available (since its presence precipitated the
 	 * creation of the virtual override).
 	 */
-	protected OrmVirtualAssociationOverrideRelationshipReference buildRelationshipReference() {
-		return this.getContextNodeFactory().buildOrmVirtualAssociationOverrideRelationshipReference(this);
+	protected OrmVirtualOverrideRelationship buildRelationship() {
+		return this.getContextNodeFactory().buildOrmVirtualOverrideRelationship(this);
 	}
 
-	public RelationshipReference resolveOverriddenRelationship() {
+	public Relationship resolveOverriddenRelationship() {
 		return this.getContainer().resolveOverriddenRelationship(this.name);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverrideRelationshipReference.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java
index 88403d86e9..01bcfd910f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverrideRelationshipReference.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,10 +9,10 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.jpa1.context.orm;
 
-import org.eclipse.jpt.core.context.AssociationOverrideRelationshipReference;
+import org.eclipse.jpt.core.context.OverrideRelationship;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.RelationshipMapping;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmVirtualAssociationOverride;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinColumnJoiningStrategy;
@@ -21,12 +21,12 @@ import org.eclipse.jpt.core.context.orm.OrmVirtualJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
 import org.eclipse.jpt.core.internal.context.orm.GenericOrmVirtualOverrideJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.jpa2.context.orm.GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmVirtualAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmVirtualOverrideRelationship2_0;
 import org.eclipse.jpt.core.utility.TextRange;
 
-public class GenericOrmVirtualAssociationOverrideRelationshipReference
+public class GenericOrmVirtualOverrideRelationship
 	extends AbstractOrmXmlContextNode
-	implements OrmVirtualAssociationOverrideRelationshipReference2_0
+	implements OrmVirtualOverrideRelationship2_0
 {
 	protected OrmVirtualJoiningStrategy strategy;
 
@@ -36,7 +36,7 @@ public class GenericOrmVirtualAssociationOverrideRelationshipReference
 	protected final OrmVirtualJoinTableJoiningStrategy joinTableStrategy;
 
 
-	public GenericOrmVirtualAssociationOverrideRelationshipReference(OrmVirtualAssociationOverride parent) {
+	public GenericOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent) {
 		super(parent);
 		this.joinColumnStrategy = this.buildJoinColumnStrategy();
 		this.joinTableStrategy = this.buildJoinTableStrategy();
@@ -117,12 +117,12 @@ public class GenericOrmVirtualAssociationOverrideRelationshipReference
 
 	// ********** conversions **********
 
-	public void initializeOn(RelationshipReference newRelationship) {
+	public void initializeOn(Relationship newRelationship) {
 		newRelationship.initializeFromJoinTableRelationship(this);
 		newRelationship.initializeFromJoinColumnRelationship(this);
 	}
 
-	public void initializeOnSpecified(AssociationOverrideRelationshipReference specifiedRelationship) {
+	public void initializeOnSpecified(OverrideRelationship specifiedRelationship) {
 		specifiedRelationship.initializeFromVirtualJoinColumnRelationship(this);
 		specifiedRelationship.initializeFromVirtualJoinTableRelationship(this);
 	}
@@ -156,7 +156,7 @@ public class GenericOrmVirtualAssociationOverrideRelationshipReference
 		return this.getAssociationOverride().getMapping();
 	}
 
-	public RelationshipReference resolveOverriddenRelationship() {
+	public Relationship resolveOverriddenRelationship() {
 		return this.getAssociationOverride().resolveOverriddenRelationship();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/NullOrmJoinColumnJoiningStrategy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/NullOrmJoinColumnJoiningStrategy.java
index 4d2fabc402..5aed128673 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/NullOrmJoinColumnJoiningStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa1/context/orm/NullOrmJoinColumnJoiningStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.ReadOnlyJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.context.RelationshipMapping;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumn;
-import org.eclipse.jpt.core.context.orm.OrmJoinColumnEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmJoinColumnRelationship;
 import org.eclipse.jpt.core.context.orm.OrmJoinColumnJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
 import org.eclipse.jpt.core.utility.TextRange;
@@ -24,14 +24,14 @@ import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator;
 
 /**
  * Used by
- * {@link org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyRelationshipReference#buildJoinColumnStrategy()}
+ * {@link org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyRelationship#buildJoinColumnStrategy()}
  * in a JPA 1.0 project.
  */
 public class NullOrmJoinColumnJoiningStrategy
 	extends AbstractOrmXmlContextNode
 	implements OrmJoinColumnJoiningStrategy
 {
-	public NullOrmJoinColumnJoiningStrategy(OrmJoinColumnEnabledRelationshipReference parent) {
+	public NullOrmJoinColumnJoiningStrategy(OrmJoinColumnRelationship parent) {
 		super(parent);
 	}
 
@@ -107,11 +107,11 @@ public class NullOrmJoinColumnJoiningStrategy
 	// ********** misc **********
 
 	@Override
-	public OrmJoinColumnEnabledRelationshipReference getParent() {
-		return (OrmJoinColumnEnabledRelationshipReference) super.getParent();
+	public OrmJoinColumnRelationship getParent() {
+		return (OrmJoinColumnRelationship) super.getParent();
 	}
 
-	public OrmJoinColumnEnabledRelationshipReference getRelationshipReference() {
+	public OrmJoinColumnRelationship getRelationship() {
 		return this.getParent();
 	}
 
@@ -160,6 +160,6 @@ public class NullOrmJoinColumnJoiningStrategy
 	}
 
 	protected RelationshipMapping getRelationshipMapping() {
-		return this.getRelationshipReference().getMapping();
+		return this.getRelationship().getMapping();
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
index 2342e34d20..38e73bdd18 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -31,7 +31,7 @@ import org.eclipse.jpt.core.context.NamedColumn;
 import org.eclipse.jpt.core.context.OverrideContainer;
 import org.eclipse.jpt.core.context.Override_;
 import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverrideContainer;
@@ -1020,17 +1020,17 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		attributeName = this.unqualify(attributeName);
 		if (attributeName == null) {
 			return null;
 		}
 		AssociationOverride override = this.valueAssociationOverrideContainer.getSpecifiedOverrideNamed(attributeName);
 		// recurse into the target embeddable if necessary
-		return (override != null) ? override.getRelationshipReference() :  this.resolveRelationshipInTargetEmbeddable(attributeName);
+		return (override != null) ? override.getRelationship() :  this.resolveRelationshipInTargetEmbeddable(attributeName);
 	}
 
-	protected RelationshipReference resolveRelationshipInTargetEmbeddable(String attributeName) {
+	protected Relationship resolveRelationshipInTargetEmbeddable(String attributeName) {
 		Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable();
 		return (targetEmbeddable == null) ? null : targetEmbeddable.resolveOverriddenRelationship(attributeName);
 	}
@@ -1449,7 +1449,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
 			return (typeMapping != null) ? typeMapping.allOverridableAssociationNames() : EmptyIterator.<String>instance();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName);
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableJoiningStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableJoiningStrategy2_0.java
index 170dba80cd..6fc9baa161 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableJoiningStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaOverrideJoinTableJoiningStrategy2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.internal.jpa1.context.AssociationOverrideInverseJoin
 import org.eclipse.jpt.core.internal.jpa1.context.AssociationOverrideJoinColumnValidator;
 import org.eclipse.jpt.core.internal.jpa1.context.AssociationOverrideJoinTableValidator;
 import org.eclipse.jpt.core.internal.jpa1.context.JoinTableTableDescriptionProvider;
-import org.eclipse.jpt.core.jpa2.context.java.JavaAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.java.JavaOverrideRelationship2_0;
 import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.core.utility.TextRange;
@@ -30,7 +30,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 public class GenericJavaOverrideJoinTableJoiningStrategy2_0
 	extends AbstractJavaJoinTableJoiningStrategy
 {
-	public GenericJavaOverrideJoinTableJoiningStrategy2_0(JavaAssociationOverrideRelationshipReference2_0 parent) {
+	public GenericJavaOverrideJoinTableJoiningStrategy2_0(JavaOverrideRelationship2_0 parent) {
 		super(parent);
 	}
 
@@ -60,17 +60,17 @@ public class GenericJavaOverrideJoinTableJoiningStrategy2_0
 	// ********** misc **********
 
 	@Override
-	public JavaAssociationOverrideRelationshipReference2_0 getParent() {
-		return (JavaAssociationOverrideRelationshipReference2_0) super.getParent();
+	public JavaOverrideRelationship2_0 getParent() {
+		return (JavaOverrideRelationship2_0) super.getParent();
 	}
 
 	@Override
-	public JavaAssociationOverrideRelationshipReference2_0 getRelationshipReference() {
+	public JavaOverrideRelationship2_0 getRelationship() {
 		return this.getParent();
 	}
 
 	protected JavaAssociationOverride getAssociationOverride() {
-		return this.getRelationshipReference().getAssociationOverride();
+		return this.getRelationship().getAssociationOverride();
 	}
 
 	public boolean isOverridable() {
@@ -81,22 +81,22 @@ public class GenericJavaOverrideJoinTableJoiningStrategy2_0
 	// ********** validation **********
 
 	public boolean validatesAgainstDatabase() {
-		return this.getRelationshipReference().getTypeMapping().validatesAgainstDatabase();
+		return this.getRelationship().getTypeMapping().validatesAgainstDatabase();
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.getRelationshipReference().getValidationTextRange(astRoot);
+		return this.getRelationship().getValidationTextRange(astRoot);
 	}
 
 	public JptValidator buildTableValidator(Table table, TableTextRangeResolver textRangeResolver) {
-		return new AssociationOverrideJoinTableValidator(this.getRelationshipReference().getAssociationOverride(), (JoinTable) table, textRangeResolver);
+		return new AssociationOverrideJoinTableValidator(this.getRelationship().getAssociationOverride(), (JoinTable) table, textRangeResolver);
 	}
 
 	public JptValidator buildJoinTableJoinColumnValidator(JoinColumn column, JoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) {
-		return new AssociationOverrideJoinColumnValidator(this.getRelationshipReference().getAssociationOverride(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider());
+		return new AssociationOverrideJoinColumnValidator(this.getRelationship().getAssociationOverride(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider());
 	}
 
 	public JptValidator buildJoinTableInverseJoinColumnValidator(JoinColumn column, JoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) {
-		return new  AssociationOverrideInverseJoinColumnValidator(this.getRelationshipReference().getAssociationOverride(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider());
+		return new  AssociationOverrideInverseJoinColumnValidator(this.getRelationship().getAssociationOverride(), column, owner, textRangeResolver, new JoinTableTableDescriptionProvider());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0.java
index 201bc3a70e..b649eefc27 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,11 +11,11 @@ package org.eclipse.jpt.core.internal.jpa2.context.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.context.JoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.JoinTableRelationship;
 import org.eclipse.jpt.core.context.JoinTableJoiningStrategy;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinTable;
-import org.eclipse.jpt.core.context.java.JavaVirtualJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.java.JavaVirtualJoinTableRelationship;
 import org.eclipse.jpt.core.context.java.JavaVirtualJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNode;
@@ -28,7 +28,7 @@ public class GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0
 	protected JavaVirtualJoinTable joinTable;
 
 
-	public GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0(JavaVirtualJoinTableEnabledRelationshipReference parent) {
+	public GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0(JavaVirtualJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -82,26 +82,26 @@ public class GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0
 	// ********** misc **********
 
 	@Override
-	public JavaVirtualJoinTableEnabledRelationshipReference getParent() {
-		return (JavaVirtualJoinTableEnabledRelationshipReference) super.getParent();
+	public JavaVirtualJoinTableRelationship getParent() {
+		return (JavaVirtualJoinTableRelationship) super.getParent();
 	}
 
-	public JavaVirtualJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public JavaVirtualJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected JoinTableJoiningStrategy getOverriddenStrategy() {
-		JoinTableEnabledRelationshipReference relationship = this.getOverriddenJoinTableRelationship();
+		JoinTableRelationship relationship = this.getOverriddenJoinTableRelationship();
 		return (relationship == null) ? null : relationship.getJoinTableJoiningStrategy();
 	}
 
-	protected JoinTableEnabledRelationshipReference getOverriddenJoinTableRelationship() {
-		RelationshipReference relationship = this.resolveOverriddenRelationship();
-		return (relationship instanceof JoinTableEnabledRelationshipReference) ? (JoinTableEnabledRelationshipReference) relationship : null;
+	protected JoinTableRelationship getOverriddenJoinTableRelationship() {
+		Relationship relationship = this.resolveOverriddenRelationship();
+		return (relationship instanceof JoinTableRelationship) ? (JoinTableRelationship) relationship : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship() {
-		return this.getRelationshipReference().resolveOverriddenRelationship();
+	protected Relationship resolveOverriddenRelationship() {
+		return this.getRelationship().resolveOverriddenRelationship();
 	}
 
 	public String getTableName() {
@@ -109,7 +109,7 @@ public class GenericJavaVirtualOverrideJoinTableJoiningStrategy2_0
 	}
 
 	public String getJoinTableDefaultName() {
-		return MappingTools.buildJoinTableDefaultName(this.getRelationshipReference());
+		return MappingTools.buildJoinTableDefaultName(this.getRelationship());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
index 755cac54a0..44d0ec73d0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -32,7 +32,7 @@ import org.eclipse.jpt.core.context.NamedColumn;
 import org.eclipse.jpt.core.context.OverrideContainer;
 import org.eclipse.jpt.core.context.Override_;
 import org.eclipse.jpt.core.context.PersistentType;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.Table;
 import org.eclipse.jpt.core.context.TypeMapping;
 import org.eclipse.jpt.core.context.java.JavaAssociationOverride;
@@ -1062,17 +1062,17 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 	}
 
 	@Override
-	public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+	public Relationship resolveOverriddenRelationship(String attributeName) {
 		attributeName = this.unqualify(attributeName);
 		if (attributeName == null) {
 			return null;
 		}
 		AssociationOverride override = this.valueAssociationOverrideContainer.getSpecifiedOverrideNamed(attributeName);
 		// recurse into the target embeddable if necessary
-		return (override != null) ? override.getRelationshipReference() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
+		return (override != null) ? override.getRelationship() : this.resolveOverriddenRelationshipInTargetEmbeddable(attributeName);
 	}
 
-	protected RelationshipReference resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
+	protected Relationship resolveOverriddenRelationshipInTargetEmbeddable(String attributeName) {
 		Embeddable targetEmbeddable = this.getResolvedTargetEmbeddable();
 		return (targetEmbeddable == null) ? null : targetEmbeddable.resolveOverriddenRelationship(attributeName);
 	}
@@ -1481,11 +1481,11 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
 			return this.getXmlMapping().getAssociationOverrides();
 		}
 
-		public RelationshipReference resolveOverriddenRelationship(String attributeName) {
+		public Relationship resolveOverriddenRelationship(String attributeName) {
 			if (this.mappingIsVirtual() && ! this.getTypeMapping().isMetadataComplete()) {
 				JavaAssociationOverride override = AbstractOrmElementCollectionMapping2_0.this.getSpecifiedJavaValueAssociationOverrideNamed(attributeName);
 				if (override != null) {
-					return override.getRelationshipReference();
+					return override.getRelationship();
 				}
 			}
 			return MappingTools.resolveOverriddenRelationship(this.getOverridableTypeMapping(), attributeName);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableJoiningStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableJoiningStrategy2_0.java
index 4cfe6dbeda..aca99b4795 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableJoiningStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOverrideJoinTableJoiningStrategy2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -15,20 +15,20 @@ import org.eclipse.jpt.core.internal.context.JoinColumnTextRangeResolver;
 import org.eclipse.jpt.core.internal.context.JptValidator;
 import org.eclipse.jpt.core.internal.context.TableTextRangeResolver;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmJoinTableJoiningStrategy;
-import org.eclipse.jpt.core.jpa2.context.orm.OrmAssociationOverrideRelationshipReference2_0;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmOverrideRelationship2_0;
 import org.eclipse.jpt.core.utility.TextRange;
 
 public class GenericOrmOverrideJoinTableJoiningStrategy2_0
 	extends AbstractOrmJoinTableJoiningStrategy
 {
-	public GenericOrmOverrideJoinTableJoiningStrategy2_0(OrmAssociationOverrideRelationshipReference2_0 parent) {
+	public GenericOrmOverrideJoinTableJoiningStrategy2_0(OrmOverrideRelationship2_0 parent) {
 		super(parent);
 	}
 
 
 	@Override
-	public OrmAssociationOverrideRelationshipReference2_0 getRelationshipReference() {
-		return (OrmAssociationOverrideRelationshipReference2_0) super.getRelationshipReference();
+	public OrmOverrideRelationship2_0 getRelationship() {
+		return (OrmOverrideRelationship2_0) super.getRelationship();
 	}
 
 	public boolean isOverridable() {
@@ -39,23 +39,23 @@ public class GenericOrmOverrideJoinTableJoiningStrategy2_0
 	// ********** validation **********
 
 	public boolean validatesAgainstDatabase() {
-		return this.getRelationshipReference().getTypeMapping().validatesAgainstDatabase();
+		return this.getRelationship().getTypeMapping().validatesAgainstDatabase();
 	}
 
 	public TextRange getValidationTextRange() {
-		TextRange textRange = this.getRelationshipReference().getAssociationOverride().getXmlOverride().getValidationTextRange();
-		return (textRange != null) ? textRange : this.getRelationshipReference().getValidationTextRange();
+		TextRange textRange = this.getRelationship().getAssociationOverride().getXmlOverride().getValidationTextRange();
+		return (textRange != null) ? textRange : this.getRelationship().getValidationTextRange();
 	}
 
 	public JptValidator buildJoinTableJoinColumnValidator(JoinColumn column, JoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) {
-		return this.getRelationshipReference().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver);
+		return this.getRelationship().buildJoinTableJoinColumnValidator(column, owner, textRangeResolver);
 	}
 
 	public JptValidator buildJoinTableInverseJoinColumnValidator(JoinColumn column, JoinColumn.Owner owner, JoinColumnTextRangeResolver textRangeResolver) {
-		return this.getRelationshipReference().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver);
+		return this.getRelationship().buildJoinTableInverseJoinColumnValidator(column, owner, textRangeResolver);
 	}
 
 	public JptValidator buildTableValidator(Table table, TableTextRangeResolver textRangeResolver) {
-		return this.getRelationshipReference().buildTableValidator(table, textRangeResolver);
+		return this.getRelationship().buildTableValidator(table, textRangeResolver);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0.java
index 31711c1990..a7fe85a6dc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2011 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,11 +10,11 @@
 package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.JoinTable;
-import org.eclipse.jpt.core.context.JoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.JoinTableRelationship;
 import org.eclipse.jpt.core.context.JoinTableJoiningStrategy;
-import org.eclipse.jpt.core.context.RelationshipReference;
+import org.eclipse.jpt.core.context.Relationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTable;
-import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTableEnabledRelationshipReference;
+import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTableRelationship;
 import org.eclipse.jpt.core.context.orm.OrmVirtualJoinTableJoiningStrategy;
 import org.eclipse.jpt.core.internal.context.MappingTools;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
@@ -27,7 +27,7 @@ public class GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0
 	protected OrmVirtualJoinTable joinTable;
 
 
-	public GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0(OrmVirtualJoinTableEnabledRelationshipReference parent) {
+	public GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0(OrmVirtualJoinTableRelationship parent) {
 		super(parent);
 	}
 
@@ -81,26 +81,26 @@ public class GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0
 	// ********** misc **********
 
 	@Override
-	public OrmVirtualJoinTableEnabledRelationshipReference getParent() {
-		return (OrmVirtualJoinTableEnabledRelationshipReference) super.getParent();
+	public OrmVirtualJoinTableRelationship getParent() {
+		return (OrmVirtualJoinTableRelationship) super.getParent();
 	}
 
-	public OrmVirtualJoinTableEnabledRelationshipReference getRelationshipReference() {
+	public OrmVirtualJoinTableRelationship getRelationship() {
 		return this.getParent();
 	}
 
 	protected JoinTableJoiningStrategy getOverriddenStrategy() {
-		JoinTableEnabledRelationshipReference relationship = this.getOverriddenJoinTableRelationship();
+		JoinTableRelationship relationship = this.getOverriddenJoinTableRelationship();
 		return (relationship == null) ? null : relationship.getJoinTableJoiningStrategy();
 	}
 
-	protected JoinTableEnabledRelationshipReference getOverriddenJoinTableRelationship() {
-		RelationshipReference relationship = this.resolveOverriddenRelationship();
-		return (relationship instanceof JoinTableEnabledRelationshipReference) ? (JoinTableEnabledRelationshipReference) relationship : null;
+	protected JoinTableRelationship getOverriddenJoinTableRelationship() {
+		Relationship relationship = this.resolveOverriddenRelationship();
+		return (relationship instanceof JoinTableRelationship) ? (JoinTableRelationship) relationship : null;
 	}
 
-	protected RelationshipReference resolveOverriddenRelationship() {
-		return this.getRelationshipReference().resolveOverriddenRelationship();
+	protected Relationship resolveOverriddenRelationship() {
+		return this.getRelationship().resolveOverriddenRelationship();
 	}
 
 	public String getTableName() {
@@ -108,7 +108,7 @@ public class GenericOrmVirtualOverrideJoinTableJoiningStrategy2_0
 	}
 
 	public String getJoinTableDefaultName() {
-		return MappingTools.buildJoinTableDefaultName(this.getRelationshipReference());
+		return MappingTools.buildJoinTableDefaultName(this.getRelationship());
 	}