fix broken references and change method names corresponding to

previously renamed classes etc.

30 files changed, 52 insertions, 52 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
index 2d8776108e..2696684593 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
@@ -89,7 +89,7 @@ public abstract class AbstractJavaOverrideContainer<
 	@Override
 	public void synchronizeWithResourceModel() {
 		super.synchronizeWithResourceModel();
-		this.synchronizeNodesWithResourceModel(this.getSpecifiedOverrides());
+		this.synchronizeModelsWithResourceModel(this.getSpecifiedOverrides());
 		// the virtual overrides do not need a sync
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
index d4c9f50765..3c39f6aa4e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
@@ -66,7 +66,7 @@ public class GenericJarFile
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getJavaManagedTypes());
+		this.updateModels(this.getJavaManagedTypes());
 	}
 
 	public JavaResourcePackageFragmentRoot getJarResourcePackageFragmentRoot() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
index aefad74df6..d6b9c657d9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
@@ -76,7 +76,7 @@ public class GenericJavaJoinTable
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedInverseJoinColumns());
+		this.updateModels(this.getSpecifiedInverseJoinColumns());
 		this.updateDefaultInverseJoinColumn();
 	}
 
@@ -307,7 +307,7 @@ public class GenericJavaJoinTable
 	@Override
 	protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) {
 		super.validateJoinColumns(messages, reporter);
-		this.validateNodes(this.getInverseJoinColumns(), messages, reporter);
+		this.validateModels(this.getInverseJoinColumns(), messages, reporter);
 	}
 
 	public boolean validatesAgainstDatabase() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
index df7847c71e..7e0112c17a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
@@ -66,9 +66,9 @@ public class GenericJavaQueryContainer
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getNamedQueries());
-		this.updateNodes(this.getNamedNativeQueries());
-		this.updateNodes(this.getNamedStoredProcedureQueries());
+		this.updateModels(this.getNamedQueries());
+		this.updateModels(this.getNamedNativeQueries());
+		this.updateModels(this.getNamedStoredProcedureQueries());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
index 9bc0ced160..0a79496766 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
@@ -58,7 +58,7 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedJoinColumns());
+		this.updateModels(this.getSpecifiedJoinColumns());
 		this.updateDefaultJoinColumn();
 	}
 
@@ -277,7 +277,7 @@ public abstract class GenericJavaReferenceTable<A extends ReferenceTableAnnotati
 	}
 
 	protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) {
-		this.validateNodes(this.getJoinColumns(), messages, reporter);
+		this.validateModels(this.getJoinColumns(), messages, reporter);
 	}
 }
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
index 75e2e96aba..02d75d3fa7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
@@ -64,7 +64,7 @@ public class GenericJavaSecondaryTable
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedPrimaryKeyJoinColumns());
+		this.updateModels(this.getSpecifiedPrimaryKeyJoinColumns());
 		this.updateDefaultPrimaryKeyJoinColumn();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
index 550f1f219b..a4a1461712 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
@@ -98,7 +98,7 @@ public class GenericJavaTableGenerator
 		this.setDefaultPkColumnName(this.buildDefaultPkColumnName());
 		this.setDefaultValueColumnName(this.buildDefaultValueColumnName());
 		this.setDefaultPkColumnValue(this.buildDefaultPkColumnValue());
-		this.updateNodes(this.getUniqueConstraints());
+		this.updateModels(this.getUniqueConstraints());
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
index 011ed2b199..b579b32e2f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
@@ -91,7 +91,7 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded>
 
 	protected OrmAssociationOverrideContainer buildAssociationOverrideContainer() {
 		return this.isOrmXml2_0Compatible() ?
-				this.getContextNodeFactory2_0().buildOrmAssociationOverrideContainer(this, this.buildAssociationOverrideContainerOwner()) :
+				this.getContextModelFactory2_0().buildOrmAssociationOverrideContainer(this, this.buildAssociationOverrideContainerOwner()) :
 				new GenericOrmAssociationOverrideContainer(this, null);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
index a08da2f3bc..b04d5427bd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
@@ -74,7 +74,7 @@ public abstract class AbstractOrmOverrideContainer<
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedOverrides());
+		this.updateModels(this.getSpecifiedOverrides());
 		this.updateVirtualOverrides();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
index fab3f1a8ef..2c8fa945fe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
@@ -42,7 +42,7 @@ public abstract class AbstractOrmPersistenceUnitMetadata
 	}
 
 	protected OrmPersistenceUnitDefaults buildPersistenceUnitDefaults() {
-		return this.getContextNodeFactory().buildOrmPersistenceUnitDefaults(this);
+		return this.getContextModelFactory().buildOrmPersistenceUnitDefaults(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
index 86fcd2cd43..bafa7480f7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverride.java
@@ -70,7 +70,7 @@ public class GenericOrmAssociationOverride
 	}
 
 	protected OrmOverrideRelationship buildRelationship() {
-		return this.getContextNodeFactory().buildOrmOverrideRelationship(this);
+		return this.getContextModelFactory().buildOrmOverrideRelationship(this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
index ebfa172b64..c1554ec8e4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java
@@ -80,7 +80,7 @@ public class GenericOrmAssociationOverrideContainer
 
 	@Override
 	protected OrmAssociationOverride buildSpecifiedOverride(XmlAssociationOverride xmlOverride) {
-		return this.getContextNodeFactory().buildOrmAssociationOverride(this, xmlOverride);
+		return this.getContextModelFactory().buildOrmAssociationOverride(this, xmlOverride);
 	}
 
 	@Override
@@ -90,6 +90,6 @@ public class GenericOrmAssociationOverrideContainer
 
 	@Override
 	protected OrmVirtualAssociationOverride buildVirtualOverride(String name) {
-		return this.getContextNodeFactory().buildOrmVirtualAssociationOverride(this, name);
+		return this.getContextModelFactory().buildOrmVirtualAssociationOverride(this, name);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java
index 96850304b1..cc3a479916 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverride.java
@@ -71,7 +71,7 @@ public class GenericOrmAttributeOverride
 	}
 
 	protected OrmColumn buildColumn() {
-		return this.getContextNodeFactory().buildOrmColumn(this, this);
+		return this.getContextModelFactory().buildOrmColumn(this, this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
index 8da4a1a4f9..27a1141748 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java
@@ -54,7 +54,7 @@ public class GenericOrmAttributeOverrideContainer
 
 	@Override
 	protected OrmAttributeOverride buildSpecifiedOverride(XmlAttributeOverride xmlOverride) {
-		return this.getContextNodeFactory().buildOrmAttributeOverride(this, xmlOverride);
+		return this.getContextModelFactory().buildOrmAttributeOverride(this, xmlOverride);
 	}
 
 	public void initializeFrom(OrmAttributeOverrideContainer oldContainer) {
@@ -70,6 +70,6 @@ public class GenericOrmAttributeOverrideContainer
 
 	@Override
 	protected OrmVirtualAttributeOverride buildVirtualOverride(String name) {
-		return this.getContextNodeFactory().buildOrmVirtualAttributeOverride(this, name);
+		return this.getContextModelFactory().buildOrmVirtualAttributeOverride(this, name);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
index d09a2d338d..cc2fee02d6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
@@ -54,7 +54,7 @@ public class GenericOrmEntity
 
 	protected Cacheable2_0 buildCacheable() {
 		return this.isOrmXml2_0Compatible() ?
-				this.getContextNodeFactory2_0().buildOrmCacheable(this) :
+				this.getContextModelFactory2_0().buildOrmCacheable(this) :
 				new NullOrmCacheable2_0(this);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
index 54afab719e..6dd260c104 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
@@ -104,7 +104,7 @@ public class GenericOrmGeneratorContainer
 	}
 
 	protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator xmlSequenceGenerator) {
-		return this.getContextNodeFactory().buildOrmSequenceGenerator(this, xmlSequenceGenerator);
+		return this.getContextModelFactory().buildOrmSequenceGenerator(this, xmlSequenceGenerator);
 	}
 
 	protected void syncSequenceGenerator() {
@@ -168,7 +168,7 @@ public class GenericOrmGeneratorContainer
 	}
 
 	protected OrmTableGenerator buildTableGenerator(XmlTableGenerator xmlTableGenerator) {
-		return this.getContextNodeFactory().buildOrmTableGenerator(this, xmlTableGenerator);
+		return this.getContextModelFactory().buildOrmTableGenerator(this, xmlTableGenerator);
 	}
 
 	protected void syncTableGenerator() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
index ec21fa8c03..6ed97137ff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
@@ -75,7 +75,7 @@ public class GenericOrmJoinTable
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedInverseJoinColumns());
+		this.updateModels(this.getSpecifiedInverseJoinColumns());
 		this.updateDefaultInverseJoinColumn();
 	}
 
@@ -280,7 +280,7 @@ public class GenericOrmJoinTable
 	}
 
 	protected OrmJoinColumn buildInverseJoinColumn(XmlJoinColumn xmlJoinColumn) {
-		return this.getContextNodeFactory().buildOrmJoinColumn(this, this.inverseJoinColumnOwner, xmlJoinColumn);
+		return this.getContextModelFactory().buildOrmJoinColumn(this, this.inverseJoinColumnOwner, xmlJoinColumn);
 	}
 
 	public RelationshipMapping getRelationshipMapping() {
@@ -297,7 +297,7 @@ public class GenericOrmJoinTable
 	@Override
 	protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) {
 		super.validateJoinColumns(messages, reporter);
-		this.validateNodes(this.getInverseJoinColumns(), messages, reporter);
+		this.validateModels(this.getInverseJoinColumns(), messages, reporter);
 	}
 
 	public boolean validatesAgainstDatabase() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
index 0c3030914c..4bd2ff2b9c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
@@ -329,7 +329,7 @@ public class GenericOrmOrderable
 	 */
 	protected OrmOrderColumn2_0 buildOrderColumn() {
 		return this.isOrmXml2_0Compatible() ?
-				this.getContextNodeFactory2_0().buildOrmOrderColumn(this, new OrderColumnOwner()) :
+				this.getContextModelFactory2_0().buildOrmOrderColumn(this, new OrderColumnOwner()) :
 				null;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
index 84811845d2..c081c4e073 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistenceUnitMetadata.java
@@ -30,7 +30,7 @@ public class GenericOrmPersistenceUnitMetadata
 	@Override
 	protected XmlPersistenceUnitMetadata buildXmlPersistenceUnitMetadata_() {
 		return EmfTools.create(
-				this.getResourceNodeFactory(),
+				this.getResourceModelFactory(),
 				OrmPackage.eINSTANCE.getXmlPersistenceUnitMetadata(),
 				XmlPersistenceUnitMetadata.class
 			);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
index 4d2fc79e64..77e8a5d6fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
@@ -69,9 +69,9 @@ public class GenericOrmQueryContainer
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getNamedQueries());
-		this.updateNodes(this.getNamedNativeQueries());
-		this.updateNodes(this.getNamedStoredProcedureQueries());
+		this.updateModels(this.getNamedQueries());
+		this.updateModels(this.getNamedNativeQueries());
+		this.updateModels(this.getNamedStoredProcedureQueries());
 	}
 
 
@@ -126,7 +126,7 @@ public class GenericOrmQueryContainer
 	}
 
 	protected OrmNamedQuery buildNamedQuery(XmlNamedQuery xmlNamedQuery) {
-		return this.getContextNodeFactory().buildOrmNamedQuery(this, xmlNamedQuery);
+		return this.getContextModelFactory().buildOrmNamedQuery(this, xmlNamedQuery);
 	}
 
 	protected void syncNamedQueries() {
@@ -208,7 +208,7 @@ public class GenericOrmQueryContainer
 	}
 
 	protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery xmlNamedNativeQuery) {
-		return this.getContextNodeFactory().buildOrmNamedNativeQuery(this, xmlNamedNativeQuery);
+		return this.getContextModelFactory().buildOrmNamedNativeQuery(this, xmlNamedNativeQuery);
 	}
 
 	protected void syncNamedNativeQueries() {
@@ -295,7 +295,7 @@ public class GenericOrmQueryContainer
 
 	protected OrmNamedStoredProcedureQuery2_1 buildNamedStoredProcedureQuery(XmlNamedStoredProcedureQuery xmlNamedQuery) {
 		return this.isOrmXml2_1Compatible() ?
-				this.getContextNodeFactory2_1().buildOrmNamedStoredProcedureQuery2_1(this, xmlNamedQuery) :
+				this.getContextModelFactory2_1().buildOrmNamedStoredProcedureQuery2_1(this, xmlNamedQuery) :
 				null;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
index 39b45c6920..8078df9ad7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
@@ -59,7 +59,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedJoinColumns());
+		this.updateModels(this.getSpecifiedJoinColumns());
 		this.updateDefaultJoinColumn();
 	}
 
@@ -234,7 +234,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab
 	}
 
 	protected OrmJoinColumn buildJoinColumn(XmlJoinColumn xmlJoinColumn) {
-		return this.getContextNodeFactory().buildOrmJoinColumn(this, this.joinColumnOwner, xmlJoinColumn);
+		return this.getContextModelFactory().buildOrmJoinColumn(this, this.joinColumnOwner, xmlJoinColumn);
 	}
 
 	@Override
@@ -263,7 +263,7 @@ public abstract class GenericOrmReferenceTable<X extends AbstractXmlReferenceTab
 	}
 
 	protected void validateJoinColumns(List<IMessage> messages, IReporter reporter) {
-		this.validateNodes(this.getJoinColumns(), messages, reporter);
+		this.validateModels(this.getJoinColumns(), messages, reporter);
 	}
 
 	// ********** completion proposals **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
index 43a40c9974..412d6a043a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
@@ -71,7 +71,7 @@ public class GenericOrmSecondaryTable
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getSpecifiedPrimaryKeyJoinColumns());
+		this.updateModels(this.getSpecifiedPrimaryKeyJoinColumns());
 		this.updateDefaultPrimaryKeyJoinColumn();
 	}
 
@@ -294,7 +294,7 @@ public class GenericOrmSecondaryTable
 	}
 
 	protected OrmPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn xmlJoinColumn) {
-		return this.getContextNodeFactory().buildOrmPrimaryKeyJoinColumn(this, this.primaryKeyJoinColumnOwner, xmlJoinColumn);
+		return this.getContextModelFactory().buildOrmPrimaryKeyJoinColumn(this, this.primaryKeyJoinColumnOwner, xmlJoinColumn);
 	}
 
 
@@ -333,7 +333,7 @@ public class GenericOrmSecondaryTable
 		//some validation messages are not database specific. If the database validation for the
 		//table fails we will stop there and not validate the join columns at all
 		if (continueValidating) {
-			this.validateNodes(this.getPrimaryKeyJoinColumns(), messages, reporter);
+			this.validateModels(this.getPrimaryKeyJoinColumns(), messages, reporter);
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
index 37b759636c..0196d653c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
@@ -95,7 +95,7 @@ public class GenericOrmTableGenerator
 		this.setDefaultPkColumnName(this.buildDefaultPkColumnName());
 		this.setDefaultValueColumnName(this.buildDefaultValueColumnName());
 		this.setDefaultPkColumnValue(this.buildDefaultPkColumnValue());
-		this.updateNodes(this.getUniqueConstraints());
+		this.updateModels(this.getUniqueConstraints());
 	}
 
 
@@ -374,7 +374,7 @@ public class GenericOrmTableGenerator
 	}
 
 	protected OrmUniqueConstraint buildUniqueConstraint(XmlUniqueConstraint resourceUniqueConstraint) {
-		return this.getContextNodeFactory().buildOrmUniqueConstraint(this, this, resourceUniqueConstraint);
+		return this.getContextModelFactory().buildOrmUniqueConstraint(this, this, resourceUniqueConstraint);
 	}
 
 	protected void syncUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
index 423cebe353..dcdf120736 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java
@@ -70,7 +70,7 @@ public class GenericOrmVirtualAssociationOverride
 	 * creation of the virtual override).
 	 */
 	protected VirtualOverrideRelationship buildRelationship() {
-		return this.getContextNodeFactory().buildOrmVirtualOverrideRelationship(this);
+		return this.getContextModelFactory().buildOrmVirtualOverrideRelationship(this);
 	}
 
 	public ReadOnlyRelationship resolveOverriddenRelationship() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java
index 4d81166bce..d24a3e3e34 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java
@@ -59,7 +59,7 @@ public class GenericOrmVirtualAttributeOverride
 	 * attribute is what precipitated the creation of the virtual override).
 	 */
 	protected VirtualColumn buildColumn() {
-		return this.getContextNodeFactory().buildOrmVirtualColumn(this, this);
+		return this.getContextModelFactory().buildOrmVirtualColumn(this, this);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
index 66e552bbd6..11e57c07af 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
@@ -195,7 +195,7 @@ public class GenericOrmXml
 	}
 
 	protected EntityMappings buildRoot(XmlEntityMappings xmlEntityMappings) {
-		return this.getContextNodeFactory().buildEntityMappings(this, xmlEntityMappings);
+		return this.getContextModelFactory().buildEntityMappings(this, xmlEntityMappings);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java
index d7b336599b..40381f540a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java
@@ -60,12 +60,12 @@ public class GenericOrmXmlDefinition
 		return this.getResourceType(XmlEntityMappings.CONTENT_TYPE, JPA.SCHEMA_VERSION);
 	}
 
-	public EFactory getResourceNodeFactory() {
+	public EFactory getResourceModelFactory() {
 		return OrmFactory.eINSTANCE;
 	}
 
 	@Override
-	protected OrmXmlContextModelFactory buildContextNodeFactory() {
+	protected OrmXmlContextModelFactory buildContextModelFactory() {
 		return new GenericOrmXmlContextModelFactory();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
index 2641d6a5e6..ad3750ee6b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
@@ -72,7 +72,7 @@ public class GenericPersistence
 	@Override
 	public void update() {
 		super.update();
-		this.updateNodes(this.getPersistenceUnits());
+		this.updateModels(this.getPersistenceUnits());
 		this.updateChildren();
 	}
 
@@ -192,7 +192,7 @@ public class GenericPersistence
 	}
 
 	protected PersistenceUnit buildPersistenceUnit(XmlPersistenceUnit xmlPersistenceUnit) {
-		return this.getContextNodeFactory().buildPersistenceUnit(this, xmlPersistenceUnit);
+		return this.getContextModelFactory().buildPersistenceUnit(this, xmlPersistenceUnit);
 	}
 
 	// ********** metamodel **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
index d9d9bd1ed9..9e0b483104 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
@@ -155,7 +155,7 @@ public class GenericPersistenceXml
 	}
 
 	protected Persistence buildRoot(XmlPersistence xmlPersistence) {
-		return this.getContextNodeFactory().buildPersistence(this, xmlPersistence);
+		return this.getContextModelFactory().buildPersistence(this, xmlPersistence);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXmlDefinition.java
index 93ea6349cc..10d8a21720 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXmlDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXmlDefinition.java
@@ -44,12 +44,12 @@ public class GenericPersistenceXmlDefinition
 		return this.getResourceType(XmlPersistence.CONTENT_TYPE, JPA.SCHEMA_VERSION);
 	}
 
-	public EFactory getResourceNodeFactory() {
+	public EFactory getResourceModelFactory() {
 		return PersistenceFactory.eINSTANCE;
 	}
 
 	@Override
-	protected PersistenceXmlContextModelFactory buildContextNodeFactory() {
+	protected PersistenceXmlContextModelFactory buildContextModelFactory() {
 		return new GenericPersistenceXmlContextModelFactory();
 	}
 }