renamed JaxbRootContextNode -> JaxbContextRoot; added api on JaxbContextNode

25 files changed, 192 insertions, 177 deletions

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java
index 5d02fce87b..400b0c8a7b 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbFactory.java
@@ -16,13 +16,13 @@ import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
-import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
 import org.eclipse.jpt.jaxb.core.context.XmlNs;
+import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.context.XmlSchema;
 import org.eclipse.jpt.jaxb.core.context.XmlSchemaType;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
@@ -88,16 +88,16 @@ public interface JaxbFactory  {
 	 * The root context node will be built once, but updated many times.
 	 * @see JaxbProject#update(org.eclipse.core.runtime.IProgressMonitor)
 	 */
-	JaxbRootContextNode buildRootContextNode(JaxbProject jaxbProject);
+	JaxbContextRoot buildContextRoot(JaxbProject jaxbProject);
 	
-	JaxbPackage buildPackage(JaxbRootContextNode parent, String packageName);
+	JaxbPackage buildPackage(JaxbContextRoot parent, String packageName);
 	
 	
 	// ********** Java context nodes **********
 	
 	JaxbPackageInfo buildJavaPackageInfo(JaxbPackage parent, JavaResourcePackage resourcePackage);
 	
-	JaxbPersistentClass buildPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType);
+	JaxbPersistentClass buildPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType);
 	
 	XmlSchema buildJavaXmlSchema(JaxbPackageInfo parent);
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java
index bff5349067..c3eefbffb7 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/JaxbProject.java
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.core.ElementChangedEvent;
 import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType;
@@ -75,7 +75,7 @@ public interface JaxbProject
 	/**
 	 * Return the root of the JAXB project's context model.
 	 */
-	JaxbRootContextNode getRootContextNode();
+	JaxbContextRoot getContextRoot();
 
 	/**
 	 * The JAXB project has been removed from the JJAXBPA model. Clean up any
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java
index 0b9798ba06..b21228978d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextNode.java
@@ -26,8 +26,13 @@ import org.eclipse.jpt.jaxb.core.JaxbNode;
  * @since 3.0
  */
 public interface JaxbContextNode
-	extends JaxbNode
-{
+		extends JaxbNode {
+	
+	/**
+	 * Return the root of the context model
+	 */
+	JaxbContextRoot getContextRoot();
+	
 	/**
 	 * Return the resource type of the context node's resource.
 	 */
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbRootContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java
index d92cb9fc38..5d20526bf5 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbRootContextNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/context/JaxbContextRoot.java
@@ -21,12 +21,11 @@ package org.eclipse.jpt.jaxb.core.context;
  * @version 3.0
  * @since 3.0
  */
-public interface JaxbRootContextNode
+public interface JaxbContextRoot
 		extends JaxbContextNode {
 	
 	/**
 	 * The set of packages.  Includes any package with any interesting JAXB content.
-	 * @see #addCollectionChangeListener(String, org.eclipse.jpt.utility.model.listener.CollectionChangeListener)
 	 */
 	Iterable<JaxbPackage> getPackages();
 	public final static String PACKAGES_COLLECTION = "packages"; //$NON-NLS-1$
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java
index a53f0bca19..2f46330780 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbFactory.java
@@ -17,22 +17,22 @@ import org.eclipse.jpt.jaxb.core.JaxbFile;
 import org.eclipse.jpt.jaxb.core.JaxbProject;
 import org.eclipse.jpt.jaxb.core.JaxbProject.Config;
 import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
-import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter;
 import org.eclipse.jpt.jaxb.core.context.XmlNs;
+import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.context.XmlSchema;
 import org.eclipse.jpt.jaxb.core.context.XmlSchemaType;
+import org.eclipse.jpt.jaxb.core.internal.context.GenericContextRoot;
 import org.eclipse.jpt.jaxb.core.internal.context.GenericPackage;
-import org.eclipse.jpt.jaxb.core.internal.context.GenericRootContextNode;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaPackageInfo;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaPersistentClass;
-import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlRootElement;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlJavaTypeAdapter;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlNs;
+import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlRootElement;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlSchema;
 import org.eclipse.jpt.jaxb.core.internal.context.java.GenericJavaXmlSchemaType;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
@@ -67,11 +67,11 @@ public abstract class AbstractJaxbFactory
 	
 	// ********** Non-resource-specific context nodes **********
 	
-	public JaxbRootContextNode buildRootContextNode(JaxbProject parent) {
-		return new GenericRootContextNode(parent);
+	public JaxbContextRoot buildContextRoot(JaxbProject parent) {
+		return new GenericContextRoot(parent);
 	}
 	
-	public JaxbPackage buildPackage(JaxbRootContextNode parent, String packageName) {
+	public JaxbPackage buildPackage(JaxbContextRoot parent, String packageName) {
 		return new GenericPackage(parent, packageName);
 	}
 	
@@ -82,7 +82,7 @@ public abstract class AbstractJaxbFactory
 		return new GenericJavaPackageInfo(parent, resourcePackage);
 	}
 	
-	public JaxbPersistentClass buildPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType) {
+	public JaxbPersistentClass buildPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType) {
 		return new GenericJavaPersistentClass(parent, resourceType);
 	}
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
index 1899a311a9..fc7a96ac32 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
@@ -39,7 +39,7 @@ import org.eclipse.jpt.core.resource.ResourceLocator;
 import org.eclipse.jpt.jaxb.core.JaxbFile;
 import org.eclipse.jpt.jaxb.core.JaxbProject;
 import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatform;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceCompilationUnit;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceNode;
@@ -118,7 +118,7 @@ public abstract class AbstractJaxbProject
 	 * The root of the model representing the collated resources associated with 
 	 * the JAXB project.
 	 */
-	protected final JaxbRootContextNode rootContextNode;
+	protected final JaxbContextRoot contextRoot;
 
 	/**
 	 * A pluggable synchronizer that keeps the JAXB
@@ -176,7 +176,7 @@ public abstract class AbstractJaxbProject
 
 //		this.externalJavaResourcePersistentTypeCache = this.buildExternalJavaResourcePersistentTypeCache();
 
-		this.rootContextNode = this.buildRootContextNode();
+		this.contextRoot = this.buildContextRoot();
 
 		// there *shouldn't* be any changes to the resource model...
 		this.setContextModelSynchronizer_(this.buildSynchronousContextModelSynchronizer());
@@ -212,8 +212,8 @@ public abstract class AbstractJaxbProject
 //		return new BinaryPersistentTypeCache(this.jpaPlatform.getAnnotationProvider());
 //	}
 
-	protected JaxbRootContextNode buildRootContextNode() {
-		return this.getFactory().buildRootContextNode(this);
+	protected JaxbContextRoot buildContextRoot() {
+		return this.getFactory().buildContextRoot(this);
 	}
 
 	// ***** inner class
@@ -532,9 +532,9 @@ public abstract class AbstractJaxbProject
 
 
 	// ********** context model **********
-
-	public JaxbRootContextNode getRootContextNode() {
-		return this.rootContextNode;
+	
+	public JaxbContextRoot getContextRoot() {
+		return this.contextRoot;
 	}
 
 
@@ -1386,7 +1386,7 @@ public abstract class AbstractJaxbProject
 	 * Called by the context model synchronizer.
 	 */
 	public IStatus synchronizeContextModel(IProgressMonitor monitor) {
-		this.rootContextNode.synchronizeWithResourceModel();
+		this.contextRoot.synchronizeWithResourceModel();
 		return Status.OK_STATUS;
 	}
 
@@ -1470,7 +1470,7 @@ public abstract class AbstractJaxbProject
 	 * Called by the update synchronizer.
 	 */
 	public IStatus update(IProgressMonitor monitor) {
-		this.rootContextNode.update();
+		this.contextRoot.update();
 		return Status.OK_STATUS;
 	}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java
index 6800790732..a2f49bf106 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/AbstractJaxbContextNode.java
@@ -12,36 +12,36 @@ package org.eclipse.jpt.jaxb.core.internal.context;
 import org.eclipse.jpt.core.JpaResourceType;
 import org.eclipse.jpt.jaxb.core.JaxbNode;
 import org.eclipse.jpt.jaxb.core.context.JaxbContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.internal.AbstractJaxbNode;
 
 public abstract class AbstractJaxbContextNode
 	extends AbstractJaxbNode
 	implements JaxbContextNode
 {
-
+	
 	// ********** constructor **********
-
+	
 	protected AbstractJaxbContextNode(JaxbNode parent) {
 		super(parent);
 	}
-
-
-	// ********** JpaNode implentation **********
-
-	/**
-	 * covariant override
-	 */
+	
+	
+	// ********** JaxbNode implentation **********
+	
 	@Override
 	public JaxbContextNode getParent() {
-		return (JaxbContextNode) super.getParent();
+		return (JaxbContextNode) super.getParent();	
 	}
-
-
+	
+	
 	// ********** JaxbContextNode implementation **********
 	
+	public JaxbContextRoot getContextRoot() {
+		return getParent().getContextRoot();
+	}
+	
 	public JpaResourceType getResourceType() {
 		return getParent().getResourceType();
 	}
-	
-
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericRootContextNode.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericContextRoot.java
index 6431fa2746..f2dcae593c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericRootContextNode.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericContextRoot.java
@@ -15,9 +15,9 @@ import java.util.Set;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.jpt.jaxb.core.JaxbProject;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.jaxb.core.resource.java.JAXB;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType;
@@ -29,9 +29,9 @@ import org.eclipse.jpt.utility.internal.iterables.TransformationIterable;
 /**
  * the context model root
  */
-public class GenericRootContextNode
+public class GenericContextRoot
 		extends AbstractJaxbContextNode
-		implements JaxbRootContextNode {
+		implements JaxbContextRoot {
 	
 	/* This object has no parent, so it must point to the JAXB project explicitly. */
 	protected final JaxbProject jaxbProject;
@@ -43,7 +43,7 @@ public class GenericRootContextNode
 	protected final Map<String, JaxbPersistentClass> persistentClasses;
 	
 	
-	public GenericRootContextNode(JaxbProject jaxbProject) {
+	public GenericContextRoot(JaxbProject jaxbProject) {
 		super(null);  // the JPA project is not really a "parent"...
 		if (jaxbProject == null) {
 			throw new NullPointerException();
@@ -56,6 +56,11 @@ public class GenericRootContextNode
 	
 	
 	@Override
+	public JaxbContextRoot getContextRoot() {
+		return this;
+	}
+	
+	@Override
 	protected boolean requiresParent() {
 		return false;
 	}
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
index 886f3a0a9c..118ccb36e0 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/GenericPackage.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.internal.context;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourcePackage;
 
 public class GenericPackage
@@ -23,7 +23,7 @@ public class GenericPackage
 	protected JaxbPackageInfo packageInfo;
 	
 	
-	public GenericPackage(JaxbRootContextNode parent, String name) {
+	public GenericPackage(JaxbContextRoot parent, String name) {
 		super(parent);
 		this.name = name;
 		JavaResourcePackage jrp = getJaxbProject().getAnnotatedJavaResourcePackage(this.name);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java
index dedd9617e6..35c7d9632e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaPersistentClass.java
@@ -9,12 +9,12 @@
  ******************************************************************************/
 package org.eclipse.jpt.jaxb.core.internal.context.java;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
-import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.context.XmlAccessOrder;
 import org.eclipse.jpt.jaxb.core.context.XmlAccessType;
+import org.eclipse.jpt.jaxb.core.context.XmlRootElement;
 import org.eclipse.jpt.jaxb.core.internal.context.AbstractJaxbContextNode;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation;
@@ -24,9 +24,8 @@ import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation;
 import org.eclipse.jpt.utility.internal.iterables.ListIterable;
 
 public class GenericJavaPersistentClass
-	extends AbstractJaxbContextNode
-	implements JaxbPersistentClass
-{
+		extends AbstractJaxbContextNode
+		implements JaxbPersistentClass {
 
 	protected final JavaResourceType resourceType;
 
@@ -47,7 +46,7 @@ public class GenericJavaPersistentClass
 
 	protected XmlRootElement rootElement;
 
-	public GenericJavaPersistentClass(JaxbRootContextNode parent, JavaResourceType resourceType) {
+	public GenericJavaPersistentClass(JaxbContextRoot parent, JavaResourceType resourceType) {
 		super(parent);
 		this.resourceType = resourceType;
 		this.factoryClass = this.getResourceFactoryClass();
@@ -64,8 +63,8 @@ public class GenericJavaPersistentClass
 	}
 
 	@Override
-	public JaxbRootContextNode getParent() {
-		return (JaxbRootContextNode) super.getParent();
+	public JaxbContextRoot getParent() {
+		return (JaxbContextRoot) super.getParent();
 	}
 
 	protected JaxbPackageInfo getPackageInfo() {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
index fc73852d14..3a04e5405d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorItemLabelProviderFactory.java
@@ -9,9 +9,9 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.ui.jface.ItemLabelProviderFactory;
@@ -40,8 +40,8 @@ public class GenericJaxb_2_1_NavigatorItemLabelProviderFactory
 			Object item,
 			DelegatingContentAndLabelProvider contentAndLabelProvider) {
 		
-		if (item instanceof JaxbRootContextNode) {
-			return new RootContextItemLabelProvider((JaxbRootContextNode) item, contentAndLabelProvider);
+		if (item instanceof JaxbContextRoot) {
+			return new JaxbContextRootItemLabelProvider((JaxbContextRoot) item, contentAndLabelProvider);
 		}
 		else if (item instanceof JaxbPackage) {
 			return new JaxbPackageItemLabelProvider((JaxbPackage) item, contentAndLabelProvider);
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
index 873b9be415..5e33b1ad2e 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory.java
@@ -9,8 +9,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.DelegatingContentAndLabelProvider;
 import org.eclipse.jpt.ui.jface.TreeItemContentProvider;
@@ -43,8 +43,8 @@ public class GenericJaxb_2_1_NavigatorTreeItemContentProviderFactory
 		DelegatingTreeContentAndLabelProvider treeContentAndLabelProvider = 
 				(DelegatingTreeContentAndLabelProvider) contentAndLabelProvider;
 		
-		if (item instanceof JaxbRootContextNode) {
-			return new RootContextItemContentProvider((JaxbRootContextNode) item, treeContentAndLabelProvider);
+		if (item instanceof JaxbContextRoot) {
+			return new JaxbContextRootItemContentProvider((JaxbContextRoot) item, treeContentAndLabelProvider);
 		}
 		else if (item instanceof JaxbPackage) {
 			return new JaxbPackageItemContentProvider((JaxbPackage) item, treeContentAndLabelProvider);	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemContentProvider.java
index eafd83a396..0c445fae8c 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemContentProvider.java
@@ -10,25 +10,26 @@
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
 import org.eclipse.core.resources.IProject;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.utility.internal.model.value.CollectionAspectAdapter;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 
 
-public class RootContextItemContentProvider
+public class JaxbContextRootItemContentProvider
 		extends AbstractTreeItemContentProvider<JaxbPackage> {
 	
-	public RootContextItemContentProvider(
-			JaxbRootContextNode rootContext, DelegatingTreeContentAndLabelProvider contentProvider) {
+	public JaxbContextRootItemContentProvider(
+			JaxbContextRoot rootContext, DelegatingTreeContentAndLabelProvider contentProvider) {
 		super(rootContext, contentProvider);
 	}
 	
+	
 	@Override
-	public JaxbRootContextNode getModel() {
-		return (JaxbRootContextNode) super.getModel();
+	public JaxbContextRoot getModel() {
+		return (JaxbContextRoot) super.getModel();
 	}
 	
 	@Override
@@ -38,8 +39,8 @@ public class RootContextItemContentProvider
 	
 	@Override
 	protected CollectionValueModel<JaxbPackage> buildChildrenModel() {
-		return new CollectionAspectAdapter<JaxbRootContextNode, JaxbPackage>(
-				JaxbRootContextNode.PACKAGES_COLLECTION,
+		return new CollectionAspectAdapter<JaxbContextRoot, JaxbPackage>(
+				JaxbContextRoot.PACKAGES_COLLECTION,
 				getModel()) {
 			
 			@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemLabelProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
index 198df79e94..f01acefb64 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/RootContextItemLabelProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbContextRootItemLabelProvider.java
@@ -9,7 +9,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiIcons;
 import org.eclipse.jpt.jaxb.ui.internal.JptJaxbUiMessages;
@@ -20,17 +20,22 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 
 
-public class RootContextItemLabelProvider
+public class JaxbContextRootItemLabelProvider
 		 extends AbstractItemLabelProvider {
 	
-	public RootContextItemLabelProvider(
-			JaxbRootContextNode rootContextNode, DelegatingContentAndLabelProvider labelProvider) {
+	public JaxbContextRootItemLabelProvider(
+			JaxbContextRoot rootContextNode, DelegatingContentAndLabelProvider labelProvider) {
 		
 		super(rootContextNode, labelProvider);
 	}
 	
 	
 	@Override
+	public JaxbContextRoot model() {
+		return (JaxbContextRoot) super.model();
+	}
+	
+	@Override
 	protected PropertyValueModel<Image> buildImageModel() {
 		return new StaticPropertyValueModel<Image>(JptJaxbUiPlugin.getImage(JptJaxbUiIcons.JAXB_CONTENT));
 	}
@@ -44,6 +49,6 @@ public class RootContextItemLabelProvider
 	protected PropertyValueModel<String> buildDescriptionModel() {
 		return new StaticPropertyValueModel<String>(
 				JptJaxbUiMessages.JaxbContent_label
-						+ " - " + ((JaxbRootContextNode) model()).getResource().getFullPath().makeRelative());
+						+ " - " + model().getResource().getFullPath().makeRelative());
 	}
 }
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
index a6d194e80f..907e804b72 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/jaxb21/JaxbPackageItemContentProvider.java
@@ -9,9 +9,9 @@
  *******************************************************************************/
 package org.eclipse.jpt.jaxb.ui.internal.jaxb21;
 
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.context.JaxbPackage;
 import org.eclipse.jpt.jaxb.core.context.JaxbPersistentClass;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
 import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider;
 import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider;
 import org.eclipse.jpt.utility.internal.model.value.CollectionAspectAdapter;
@@ -27,20 +27,21 @@ public class JaxbPackageItemContentProvider
 		super(jaxbPackage, contentProvider);
 	}
 	
+	
 	@Override
 	public JaxbPackage getModel() {
 		return (JaxbPackage) super.getModel();
 	}
 	
 	@Override
-	public JaxbRootContextNode getParent() {
-		return (JaxbRootContextNode) getModel().getParent();
+	public JaxbContextRoot getParent() {
+		return (JaxbContextRoot) getModel().getParent();
 	}
 	
 	@Override
 	protected CollectionValueModel<JaxbPersistentClass> buildChildrenModel() {
-		return new CollectionAspectAdapter<JaxbRootContextNode, JaxbPersistentClass>(
-				JaxbRootContextNode.PERSISTENT_CLASSES_COLLECTION, getParent()) {
+		return new CollectionAspectAdapter<JaxbContextRoot, JaxbPersistentClass>(
+				JaxbContextRoot.PERSISTENT_CLASSES_COLLECTION, getParent()) {
 			@Override
 			protected Iterable<JaxbPersistentClass> getIterable() {
 				return this.subject.getPersistentClasses(getModel());
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
index f8e4aa18ac..437ad3c193 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/navigator/JaxbNavigatorContentProvider.java
@@ -137,7 +137,7 @@ public class JaxbNavigatorContentProvider
 							JptJaxbUiPlugin.getJaxbPlatformUiManager().getJaxbPlatformUi(desc);
 					
 					if (platformUi != null) {
-						return new Object[] {jaxbProject.getRootContextNode()};
+						return new Object[] {jaxbProject.getContextRoot()};
 					}
 				}	
 			}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericRootContextNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java
index 454418e290..196b0a67a1 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericRootContextNodeTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java
@@ -27,10 +27,10 @@ import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
 
 @SuppressWarnings("nls")
-public class GenericRootContextNodeTests extends JaxbContextModelTestCase
+public class GenericContextRootTests extends JaxbContextModelTestCase
 {
 	
-	public GenericRootContextNodeTests(String name) {
+	public GenericContextRootTests(String name) {
 		super(name);
 	}
 	
@@ -63,15 +63,15 @@ public class GenericRootContextNodeTests extends JaxbContextModelTestCase
 
 	public void testGetPackages() throws Exception {
 		this.createPackageInfoWithAccessorOrder();
-		Iterator<JaxbPackage> packages = this.getRootContextNode().getPackages().iterator();
-		assertEquals(1, this.getRootContextNode().getPackagesSize());
+		Iterator<JaxbPackage> packages = this.getContextRoot().getPackages().iterator();
+		assertEquals(1, this.getContextRoot().getPackagesSize());
 		assertEquals(PACKAGE_NAME, packages.next().getName());
 		assertFalse(packages.hasNext());
 
 		//add an unannotated package-info.java and make sure it's not added to the root context node
 		this.createUnannotatedPackageInfo("foo");
-		packages = this.getRootContextNode().getPackages().iterator();
-		assertEquals(1, this.getRootContextNode().getPackagesSize());
+		packages = this.getContextRoot().getPackages().iterator();
+		assertEquals(1, this.getContextRoot().getPackagesSize());
 		assertEquals(PACKAGE_NAME, packages.next().getName());
 		assertFalse(packages.hasNext());
 
@@ -80,29 +80,29 @@ public class GenericRootContextNodeTests extends JaxbContextModelTestCase
 		AnnotatedElement annotatedElement = this.annotatedElement(fooResourcePackage);
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
-				GenericRootContextNodeTests.this.addXmlAccessorTypeAnnotation(declaration, JAXB.XML_ACCESS_TYPE__PROPERTY);
+				GenericContextRootTests.this.addXmlAccessorTypeAnnotation(declaration, JAXB.XML_ACCESS_TYPE__PROPERTY);
 			}
 		});
 
-		Iterable<String> packageNames = new TransformationIterable<JaxbPackage, String>(this.getRootContextNode().getPackages()) {
+		Iterable<String> packageNames = new TransformationIterable<JaxbPackage, String>(this.getContextRoot().getPackages()) {
 			@Override
 			protected String transform(JaxbPackage o) {
 				return o.getName();
 			}
 		};
-		assertEquals(2, this.getRootContextNode().getPackagesSize());
+		assertEquals(2, this.getContextRoot().getPackagesSize());
 		assertTrue(CollectionTools.contains(packageNames, PACKAGE_NAME));
 		assertTrue(CollectionTools.contains(packageNames, "foo"));
 
 		//remove the annotation from the package-info.java and test it's removed from the root context node
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
-				GenericRootContextNodeTests.this.removeXmlAccessorTypeAnnotation(declaration);
+				GenericContextRootTests.this.removeXmlAccessorTypeAnnotation(declaration);
 			}
 		});
 
-		packages = this.getRootContextNode().getPackages().iterator();
-		assertEquals(1, this.getRootContextNode().getPackagesSize());
+		packages = this.getContextRoot().getPackages().iterator();
+		assertEquals(1, this.getContextRoot().getPackagesSize());
 		assertEquals(PACKAGE_NAME, packages.next().getName());
 		assertFalse(packages.hasNext());
 	}
@@ -118,15 +118,15 @@ public class GenericRootContextNodeTests extends JaxbContextModelTestCase
 
 	public void testGetPersistentClasses() throws Exception {
 		this.createTypeWithXmlType();
-		Iterator<JaxbPersistentClass> persistentClasses = this.getRootContextNode().getPersistentClasses().iterator();
-		assertEquals(1, this.getRootContextNode().getPersistentClassesSize());
+		Iterator<JaxbPersistentClass> persistentClasses = this.getContextRoot().getPersistentClasses().iterator();
+		assertEquals(1, this.getContextRoot().getPersistentClassesSize());
 		assertEquals(FULLY_QUALIFIED_TYPE_NAME, persistentClasses.next().getFullyQualifiedName());
 		assertFalse(persistentClasses.hasNext());
 
 		//add an unannotated class and make sure it's not added to the root context node
 		this.createUnannotatedTestTypeNamed("Foo");
-		persistentClasses = this.getRootContextNode().getPersistentClasses().iterator();
-		assertEquals(1, this.getRootContextNode().getPersistentClassesSize());
+		persistentClasses = this.getContextRoot().getPersistentClasses().iterator();
+		assertEquals(1, this.getContextRoot().getPersistentClassesSize());
 		assertEquals(FULLY_QUALIFIED_TYPE_NAME, persistentClasses.next().getFullyQualifiedName());
 		assertFalse(persistentClasses.hasNext());
 
@@ -135,29 +135,29 @@ public class GenericRootContextNodeTests extends JaxbContextModelTestCase
 		AnnotatedElement annotatedElement = this.annotatedElement(fooResourceType);
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
-				GenericRootContextNodeTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
+				GenericContextRootTests.this.addMarkerAnnotation(declaration.getDeclaration(), JAXB.XML_TYPE);
 			}
 		});
 
-		Iterable<String> persistentClassNames = new TransformationIterable<JaxbPersistentClass, String>(this.getRootContextNode().getPersistentClasses()) {
+		Iterable<String> persistentClassNames = new TransformationIterable<JaxbPersistentClass, String>(this.getContextRoot().getPersistentClasses()) {
 			@Override
 			protected String transform(JaxbPersistentClass o) {
 				return o.getFullyQualifiedName();
 			}
 		};
-		assertEquals(2, this.getRootContextNode().getPersistentClassesSize());
+		assertEquals(2, this.getContextRoot().getPersistentClassesSize());
 		assertTrue(CollectionTools.contains(persistentClassNames, "test.Foo"));
 		assertTrue(CollectionTools.contains(persistentClassNames, FULLY_QUALIFIED_TYPE_NAME));
 
 		//remove the annotation from the class and test it's removed from the root context node
 		annotatedElement.edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
-				GenericRootContextNodeTests.this.removeAnnotation(declaration, JAXB.XML_TYPE);
+				GenericContextRootTests.this.removeAnnotation(declaration, JAXB.XML_TYPE);
 			}
 		});
 
-		persistentClasses = this.getRootContextNode().getPersistentClasses().iterator();
-		assertEquals(1, this.getRootContextNode().getPersistentClassesSize());
+		persistentClasses = this.getContextRoot().getPersistentClasses().iterator();
+		assertEquals(1, this.getContextRoot().getPersistentClassesSize());
 		assertEquals(FULLY_QUALIFIED_TYPE_NAME, persistentClasses.next().getFullyQualifiedName());
 		assertFalse(persistentClasses.hasNext());
 	}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java
index 0d79717fbd..1b950d382f 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.utility.jdt.AnnotatedElement;
 import org.eclipse.jpt.jaxb.core.JaxbFacet;
 import org.eclipse.jpt.jaxb.core.JaxbProject;
 import org.eclipse.jpt.jaxb.core.JptJaxbCorePlugin;
-import org.eclipse.jpt.jaxb.core.context.JaxbRootContextNode;
+import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot;
 import org.eclipse.jpt.jaxb.core.internal.facet.JaxbFacetInstallConfig;
 import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription;
 import org.eclipse.jpt.jaxb.core.resource.java.JavaResourceAnnotatedElement;
@@ -58,8 +58,8 @@ public abstract class JaxbContextModelTestCase extends AnnotationTestCase
 		return JaxbFacet.VERSION_2_1;
 	}
 
-	protected JaxbRootContextNode getRootContextNode() {
-		return this.getJaxbProject().getRootContextNode();
+	protected JaxbContextRoot getContextRoot() {
+		return this.getJaxbProject().getContextRoot();
 	}
 	
 	protected AnnotatedElement annotatedElement(JavaResourceAnnotatedElement resource) {
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java
index f14a17beb2..7ecde92d62 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbCoreContextModelTests.java
@@ -20,7 +20,7 @@ public class JaxbCoreContextModelTests extends TestCase
 	public static Test suite() {
 		TestSuite suite = new TestSuite(JaxbCoreContextModelTests.class.getName());
 
-		suite.addTestSuite(GenericRootContextNodeTests.class);
+		suite.addTestSuite(GenericContextRootTests.class);
 		suite.addTest(JaxbCoreJavaContextModelTests.suite());
 		return suite;
 	}
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
index a9cc3dc22e..dbed61acb5 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPackageInfoTests.java
@@ -57,7 +57,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 	
 	public void testModifyAccessType() throws Exception {
 		createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
 		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getSpecifiedAccessType());
@@ -87,7 +87,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 	
 	public void testUpdateAccessType() throws Exception {
 		createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
 		assertEquals(XmlAccessType.PROPERTY, contextPackageInfo.getSpecifiedAccessType());
@@ -131,7 +131,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 	
 	public void testModifyAccessOrder() throws Exception {
 		createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
 		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getSpecifiedAccessOrder());
@@ -153,7 +153,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 	
 	public void testUpdateAccessOrder() throws Exception {
 		createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
 		assertEquals(XmlAccessOrder.ALPHABETICAL, contextPackageInfo.getSpecifiedAccessOrder());
@@ -195,7 +195,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testGetXmlSchemaTypes() throws Exception {
 		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
@@ -231,7 +231,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testGetXmlSchemaTypesSize() throws Exception {
 		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		assertEquals(0, contextPackageInfo.getXmlSchemaTypesSize());
@@ -251,7 +251,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		//create a package info with an annotation other than XmlSchema to test
 		//adding things to the null schema annotation
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlSchemaType(0).setName("bar");
@@ -275,7 +275,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		//create a package info with an annotation other than XmlSchema to test
 		//adding things to the null schema annotation
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlSchemaType(0).setName("bar");
@@ -292,7 +292,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testRemoveXmlSchemaType() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlSchemaType(0).setName("bar");
@@ -324,7 +324,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testMoveXmlSchemaType() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlSchemaType(0).setName("bar");
@@ -354,7 +354,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testSyncXmlSchemaTypes() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
@@ -444,7 +444,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testSyncAddXmlSchemaTypes() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		ListIterable<XmlSchemaType> xmlSchemaTypes = contextPackageInfo.getXmlSchemaTypes();
@@ -525,7 +525,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 	
 	public void testGetXmlJavaTypeAdapters() throws Exception {
 		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		ListIterable<XmlJavaTypeAdapter> xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
@@ -564,7 +564,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testGetXmlJavaTypeAdaptersSize() throws Exception {
 		this.createPackageInfoWithAccessorOrder();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		assertEquals(0, contextPackageInfo.getXmlJavaTypeAdaptersSize());
@@ -584,7 +584,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		//create a package info with an annotation other than XmlSchema to test
 		//adding things to the null schema annotation
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
@@ -608,7 +608,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 		//create a package info with an annotation other than XmlSchema to test
 		//adding things to the null schema annotation
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
@@ -625,7 +625,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testRemoveXmlJavaTypeAdapter() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("String");
@@ -663,7 +663,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testMoveXmlJavaTypeAdapter() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		contextPackageInfo.addXmlJavaTypeAdapter(0).setValue("bar");
@@ -693,7 +693,7 @@ public class GenericJavaPackageInfoTests extends JaxbContextModelTestCase
 
 	public void testSyncXmlJavaTypeAdapters() throws Exception {
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
 		ListIterable<XmlJavaTypeAdapter> xmlJavaTypeAdapters = contextPackageInfo.getXmlJavaTypeAdapters();
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
index a585c43e28..a7c564a6da 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaPersistentClassTests.java
@@ -85,7 +85,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifyFactoryClass() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getFactoryClass());
@@ -114,7 +114,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateFactoryClass() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getFactoryClass());
@@ -142,7 +142,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifyFactoryMethod() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getFactoryMethod());
@@ -171,7 +171,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateFactoryMethod() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getFactoryMethod());
@@ -199,7 +199,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifySchemaTypeName() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getSchemaTypeName());
@@ -228,7 +228,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateSchemaTypeName() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getSchemaTypeName());
@@ -256,7 +256,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifyNamespace() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getNamespace());
@@ -285,7 +285,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateNamespace() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getNamespace());
@@ -315,7 +315,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifyAccessType() throws Exception {
 		createXmlTypeWithAccessorType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertEquals(XmlAccessType.PROPERTY, persistentClass.getSpecifiedAccessType());
@@ -346,7 +346,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateAccessType() throws Exception {
 		createXmlTypeWithAccessorType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertEquals(XmlAccessType.PROPERTY, persistentClass.getSpecifiedAccessType());
@@ -390,7 +390,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	
 	public void testModifyAccessOrder() throws Exception {
 		createXmlTypeWithAccessorOrder();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getSpecifiedAccessOrder());
@@ -412,7 +412,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	
 	public void testUpdateAccessOrder() throws Exception {
 		createXmlTypeWithAccessorOrder();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertEquals(XmlAccessOrder.ALPHABETICAL, persistentClass.getSpecifiedAccessOrder());
@@ -440,7 +440,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testGetPropOrder() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		ListIterator<String> props = persistentClass.getPropOrder().iterator();
@@ -467,7 +467,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testGetPropOrderSize() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		assertEquals(0, persistentClass.getPropOrderSize());
@@ -485,7 +485,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testAddProp() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		persistentClass.addProp(0, "bar");
@@ -503,7 +503,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testAddProp2() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		persistentClass.addProp(0, "bar");
@@ -521,7 +521,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testRemoveProp() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		persistentClass.addProp(0, "bar");
@@ -549,7 +549,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testMoveProp() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		persistentClass.addProp(0, "bar");
@@ -588,7 +588,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 
 	public void testSyncXmlNsPrefixes() throws Exception {
 		this.createTypeWithXmlType();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		ListIterator<String> props = persistentClass.getPropOrder().iterator();
@@ -701,7 +701,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testModifyXmlRootElement() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
 		assertNull(persistentClass.getRootElement());
@@ -723,7 +723,7 @@ public class GenericJavaPersistentClassTests extends JaxbContextModelTestCase
 	public void testUpdateXmlRootElement() throws Exception {
 		createTypeWithXmlType();
 		
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
 		assertNull(persistentClass.getRootElement());
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java
index d5df4a39e3..e067b9d0b3 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlJavaTypeAdapterTests.java
@@ -43,7 +43,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
 
 	public void testModifyValue() throws Exception {
 		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -63,7 +63,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
 
 	public void testUpdateValue() throws Exception {
 		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -88,7 +88,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
 
 	public void testModifyType() throws Exception {
 		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -114,7 +114,7 @@ public class GenericJavaXmlJavaTypeAdapterTests extends JaxbContextModelTestCase
 
 	public void testUpdateType() throws Exception {
 		this.createPackageInfoWithXmlJavaTypeAdapter();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlJavaTypeAdapter contextXmlJavaTypeAdapter = contextPackageInfo.getXmlJavaTypeAdapters().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
index 9dbfcf51da..a2897820a9 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java
@@ -51,7 +51,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
 	
 	public void testModifyNamespace() throws Exception {
 		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		XmlRootElement contextRootElement = persistentClass.getRootElement();
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
@@ -70,7 +70,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
 	
 	public void testUpdateNamespace() throws Exception {
 		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		XmlRootElement contextRootElement = persistentClass.getRootElement();
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
@@ -96,7 +96,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
 
 	public void testModifyName() throws Exception {
 		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		XmlRootElement contextRootElement = persistentClass.getRootElement();
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 	
@@ -115,7 +115,7 @@ public class GenericJavaXmlRootElementTests extends JaxbContextModelTestCase
 	
 	public void testUpdateName() throws Exception {
 		createTypeWithXmlTypeWithXmlRootElement();
-		JaxbPersistentClass persistentClass = CollectionTools.get(getRootContextNode().getPersistentClasses(), 0);
+		JaxbPersistentClass persistentClass = CollectionTools.get(getContextRoot().getPersistentClasses(), 0);
 		XmlRootElement contextRootElement = persistentClass.getRootElement();
 		JavaResourceType resourceType = persistentClass.getJaxbResourceType();
 
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java
index ba334cab69..e5b8924ddc 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTests.java
@@ -56,7 +56,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testModifyNamespace() throws Exception {
 		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -83,7 +83,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testUpdateNamespace() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -109,7 +109,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testModifyLocation() throws Exception {
 		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -144,7 +144,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testUpdateLocation() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -177,7 +177,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testModifyAttributeFormDefault() throws Exception {
 		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -218,7 +218,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testUpdateAttributeFormDefault() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -270,7 +270,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testModifyElementFormDefault() throws Exception {
 		createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -311,7 +311,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 	
 	public void testUpdateElementFormDefault() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -363,7 +363,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testGetXmlNsPrefixes() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -405,7 +405,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testGetXmlNsPrexiesSize() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -426,7 +426,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 		//create a package info with an annotation other than XmlSchema to test
 		//adding things to the null schema annotation
 		this.createPackageInfoWithAccessorType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -457,7 +457,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testAddXmlNsPrefix2() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -488,7 +488,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testRemoveXmlNsPrefix() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -518,7 +518,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testMoveXmlNsPrefix() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -559,7 +559,7 @@ public class GenericJavaXmlSchemaTests extends JaxbContextModelTestCase
 
 	public void testSyncXmlNsPrefixes() throws Exception {
 		this.createPackageInfoWithXmlSchema();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchema contextXmlSchema = contextPackageInfo.getXmlSchema();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
index f8c5f90c25..99af6faf4a 100644
--- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
+++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSchemaTypeTests.java
@@ -42,7 +42,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testModifyName() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -62,7 +62,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testUpdateName() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -87,7 +87,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testModifyNamespace() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -113,7 +113,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testUpdateNamespace() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 
@@ -142,7 +142,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testModifyType() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();
 	
@@ -168,7 +168,7 @@ public class GenericJavaXmlSchemaTypeTests extends JaxbContextModelTestCase
 	
 	public void testUpdateType() throws Exception {
 		this.createPackageInfoWithXmlSchemaType();
-		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getRootContextNode().getPackages(), 0).getPackageInfo();
+		JaxbPackageInfo contextPackageInfo = CollectionTools.get(getContextRoot().getPackages(), 0).getPackageInfo();
 		XmlSchemaType contextXmlSchemaType = contextPackageInfo.getXmlSchemaTypes().iterator().next();
 		JavaResourcePackage resourcePackage = contextPackageInfo.getResourcePackage();