package rename to jpa2

author: kmoore 2009-07-17 16:15:02 +0000
committer: kmoore 2009-07-17 16:15:02 +0000
commit: 2871f140476c9e2d586f73ad203fcf0d3aab963c (patch)
tree: f5ee4d77d7ab19e5706404cad01d2e81eb85833e /jpa
parent: 129fed1962f7f450f3c1f1257a7c38088c8fd7e1 (diff)
download: webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.tar.gz
webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.tar.xz
webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.zip
306 files changed, 1927 insertions, 1925 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
index f6569eb791..dda3a33703 100644
--- a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF
@@ -40,6 +40,17 @@ Export-Package: org.eclipse.jpt.core,
  org.eclipse.jpt.core.internal.context.orm;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.context.persistence;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.facet;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.context;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.context.java;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.context.orm;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.operations;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.platform;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.resource.java;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.resource.java.binary;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.resource.java.source;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.resource.orm;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.internal.jpa2.resource.persistence;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.operations;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.platform;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.prefs;x-friends:="org.eclipse.jpt.ui",
@@ -55,28 +66,17 @@ Export-Package: org.eclipse.jpt.core,
  org.eclipse.jpt.core.internal.utility;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.utility.jdt;x-friends:="org.eclipse.jpt.ui",
  org.eclipse.jpt.core.internal.validation;x-friends:="org.eclipse.jpt.ui",
+ org.eclipse.jpt.core.jpa2,
+ org.eclipse.jpt.core.jpa2.context,
+ org.eclipse.jpt.core.jpa2.context.orm,
+ org.eclipse.jpt.core.jpa2.resource.java,
+ org.eclipse.jpt.core.jpa2.resource.orm,
+ org.eclipse.jpt.core.jpa2.resource.persistence,
  org.eclipse.jpt.core.resource,
  org.eclipse.jpt.core.resource.java,
  org.eclipse.jpt.core.resource.orm,
  org.eclipse.jpt.core.resource.persistence,
  org.eclipse.jpt.core.resource.xml,
  org.eclipse.jpt.core.utility,
- org.eclipse.jpt.core.utility.jdt,
- org.eclipse.jpt2_0.core,
- org.eclipse.jpt2_0.core.context,
- org.eclipse.jpt2_0.core.context.orm,
- org.eclipse.jpt2_0.core.internal;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.context;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.context.java;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.context.orm;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.operations;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.platform;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.resource.java;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.resource.java.binary;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.resource.java.source;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.resource.orm;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.internal.resource.persistence;x-friends:="org.eclipse.jpt.ui",
- org.eclipse.jpt2_0.core.resource.java,
- org.eclipse.jpt2_0.core.resource.orm,
- org.eclipse.jpt2_0.core.resource.persistence
+ org.eclipse.jpt.core.utility.jdt
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jpt2_0ResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpa2ResourceModels.genmodel
index 182c4fc078..03a2b7a176 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/jpt2_0ResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.core/model/jpa2ResourceModels.genmodel
@@ -8,168 +8,171 @@
     rootExtendsClass="org.eclipse.jpt.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
     testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
     complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>orm2_0.ecore</foreignModel>
-  <foreignModel>persistence2_0.ecore</foreignModel>
-  <genPackages prefix="Orm2_0" basePackage="org.eclipse.jpt2_0.core.resource" disposableProviderFactory="true"
-      adapterFactory="false" ecorePackage="orm2_0.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm2_0.ecore#//LockModeType">
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/READ"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/WRITE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/OPTIMISTIC"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/OPTIMISTIC_FORCE_INCREMENT"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/PESSIMISTIC_READ"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/PESSIMISTIC_WRITE"/>
-      <genEnumLiterals ecoreEnumLiteral="orm2_0.ecore#//LockModeType/PESSIMISTIC_FORCE_INCREMENT"/>
+  <foreignModel>orm2.ecore</foreignModel>
+  <foreignModel>persistence2.ecore</foreignModel>
+  <genPackages prefix="Orm2_0" basePackage="org.eclipse.jpt.core.jpa2.resource" disposableProviderFactory="true"
+      adapterFactory="false" ecorePackage="orm2.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="orm2.ecore#//LockModeType">
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/READ"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/WRITE"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/OPTIMISTIC"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/OPTIMISTIC_FORCE_INCREMENT"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/PESSIMISTIC_READ"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/PESSIMISTIC_WRITE"/>
+      <genEnumLiterals ecoreEnumLiteral="orm2.ecore#//LockModeType/PESSIMISTIC_FORCE_INCREMENT"/>
     </genEnums>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlEntityMappings"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlPersistenceUnitMetadata">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlPersistenceUnitMetadata/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlPersistenceUnitDefaults">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlPersistenceUnitDefaults/description"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlPersistenceUnitDefaults/delimitedIdentifiers"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlEntity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlEntity/cacheable"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlMappedSuperclass"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlEmbeddable"/>
-    <genClasses ecoreClass="orm2_0.ecore#//Attributes">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//Attributes/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//Attributes/elementCollections"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlAttributeMapping"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlElementCollection">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/targetClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/fetch"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/orderBy"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/orderColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/mapKey"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/mapKeyClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/mapKeyTemporal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/mapKeyEnumerated"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/mapKeyAttributeOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/mapKeyColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/mapKeyJoinColumns"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/column"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/temporal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/enumerated"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlElementCollection/lob"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/attributeOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/associationOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlElementCollection/collectionTable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlId"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlEmbeddedId"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlEmbedded">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlEmbedded/associationOverrides"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlBasic"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlVersion"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlManyToOne">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlManyToOne/mappedById"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlManyToOne/id"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlOneToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlOneToMany/orderColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlOneToMany/mapKeyClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToMany/mapKeyTemporal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToMany/mapKeyEnumerated"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlOneToMany/mapKeyAttributeOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlOneToMany/mapKeyColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlOneToMany/mapKeyJoinColumns"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToMany/orphanRemoval"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlOneToOne">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToOne/orphanRemoval"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToOne/mappedById"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOneToOne/id"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlManyToMany">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlManyToMany/orderColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlManyToMany/mapKeyClass"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlManyToMany/mapKeyTemporal"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlManyToMany/mapKeyEnumerated"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlManyToMany/mapKeyAttributeOverrides"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlManyToMany/mapKeyColumn"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlManyToMany/mapKeyJoinColumns"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlTransient"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlAssociationOverride">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlAssociationOverride/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlAssociationOverride/joinTable"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlAttributeOverride">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlAttributeOverride/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//EntityListeners"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//EntityListener">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//EntityListener/description"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlQuery/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlNamedNativeQuery"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlNamedQuery">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlNamedQuery/lockMode"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlGenerator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlGenerator/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlSequenceGenerator"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlTableGenerator"/>
-    <genClasses ecoreClass="orm2_0.ecore#//SqlResultSetMapping">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//SqlResultSetMapping/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//EventMethod">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//EventMethod/description"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//PostLoad"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PostPersist"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PostRemove"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PostUpdate"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PrePersist"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PreRemove"/>
-    <genClasses ecoreClass="orm2_0.ecore#//PreUpdate"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlQueryHint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlQueryHint/description"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlCollectionTable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2_0.ecore#//XmlCollectionTable/joinColumns"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlOrderColumn">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOrderColumn/insertable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOrderColumn/nullable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOrderColumn/updatable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlOrderColumn/table"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlMapKeyColumn"/>
-    <genClasses image="false" ecoreClass="orm2_0.ecore#//XmlMapKeyJoinColumn"/>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlMapKeyClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlMapKeyClass/className"/>
-    </genClasses>
-    <genClasses ecoreClass="orm2_0.ecore#//XmlUniqueConstraint">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2_0.ecore#//XmlUniqueConstraint/name"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlEntityMappings"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlPersistenceUnitMetadata">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlPersistenceUnitMetadata/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlPersistenceUnitDefaults">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlPersistenceUnitDefaults/description"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlPersistenceUnitDefaults/delimitedIdentifiers"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlEntity">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlEntity/cacheable"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlMappedSuperclass"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlEmbeddable"/>
+    <genClasses ecoreClass="orm2.ecore#//Attributes">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//Attributes/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//Attributes/elementCollections"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlAttributeMapping"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlElementCollection">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/targetClass"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/fetch"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/orderBy"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/orderColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/mapKey"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/mapKeyClass"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/mapKeyTemporal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/mapKeyEnumerated"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/mapKeyAttributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/mapKeyColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/mapKeyJoinColumns"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/column"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/temporal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/enumerated"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlElementCollection/lob"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/attributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/associationOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlElementCollection/collectionTable"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlId"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlEmbeddedId"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlEmbedded">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlEmbedded/associationOverrides"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlBasic"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlVersion"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlManyToOne">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlManyToOne/mappedById"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlManyToOne/id"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlOneToMany">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlOneToMany/orderColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlOneToMany/mapKeyClass"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToMany/mapKeyTemporal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToMany/mapKeyEnumerated"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlOneToMany/mapKeyAttributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlOneToMany/mapKeyColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlOneToMany/mapKeyJoinColumns"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToMany/orphanRemoval"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlOneToOne">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToOne/orphanRemoval"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToOne/mappedById"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOneToOne/id"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlManyToMany">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlManyToMany/orderColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlManyToMany/mapKeyClass"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlManyToMany/mapKeyTemporal"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlManyToMany/mapKeyEnumerated"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlManyToMany/mapKeyAttributeOverrides"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlManyToMany/mapKeyColumn"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlManyToMany/mapKeyJoinColumns"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlTransient"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlAssociationOverride">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlAssociationOverride/description"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlAssociationOverride/joinTable"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlAttributeOverride">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlAttributeOverride/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//EntityListeners"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//EntityListener">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//EntityListener/description"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlQuery">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlQuery/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlNamedNativeQuery"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlNamedQuery">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlNamedQuery/lockMode"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlGenerator">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlGenerator/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlSequenceGenerator">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlSequenceGenerator/catalog"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlSequenceGenerator/schema"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlTableGenerator"/>
+    <genClasses ecoreClass="orm2.ecore#//SqlResultSetMapping">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//SqlResultSetMapping/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//EventMethod">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//EventMethod/description"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//PostLoad"/>
+    <genClasses ecoreClass="orm2.ecore#//PostPersist"/>
+    <genClasses ecoreClass="orm2.ecore#//PostRemove"/>
+    <genClasses ecoreClass="orm2.ecore#//PostUpdate"/>
+    <genClasses ecoreClass="orm2.ecore#//PrePersist"/>
+    <genClasses ecoreClass="orm2.ecore#//PreRemove"/>
+    <genClasses ecoreClass="orm2.ecore#//PreUpdate"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlQueryHint">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlQueryHint/description"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlCollectionTable">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference orm2.ecore#//XmlCollectionTable/joinColumns"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlOrderColumn">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOrderColumn/insertable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOrderColumn/nullable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOrderColumn/updatable"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlOrderColumn/table"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlMapKeyColumn"/>
+    <genClasses image="false" ecoreClass="orm2.ecore#//XmlMapKeyJoinColumn"/>
+    <genClasses ecoreClass="orm2.ecore#//XmlMapKeyClass">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlMapKeyClass/className"/>
+    </genClasses>
+    <genClasses ecoreClass="orm2.ecore#//XmlUniqueConstraint">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm2.ecore#//XmlUniqueConstraint/name"/>
     </genClasses>
   </genPackages>
-  <genPackages prefix="Persistence2_0" basePackage="org.eclipse.jpt2_0.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence2_0.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence2_0.ecore#//XmlPersistenceUnitCachingType">
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitCachingType/ALL"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitCachingType/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitCachingType/ENABLE_SELECTIVE"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitCachingType/DISABLE_SELECTIVE"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitCachingType/UNSPECIFIED"/>
+  <genPackages prefix="Persistence2_0" basePackage="org.eclipse.jpt.core.jpa2.resource"
+      disposableProviderFactory="true" adapterFactory="false" ecorePackage="persistence2.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence2.ecore#//XmlPersistenceUnitCachingType">
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitCachingType/ALL"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitCachingType/NONE"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitCachingType/ENABLE_SELECTIVE"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitCachingType/DISABLE_SELECTIVE"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitCachingType/UNSPECIFIED"/>
     </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence2_0.ecore#//XmlPersistenceUnitValidationModeType">
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitValidationModeType/AUTO"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitValidationModeType/CALLBACK"/>
-      <genEnumLiterals ecoreEnumLiteral="persistence2_0.ecore#//XmlPersistenceUnitValidationModeType/NONE"/>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="persistence2.ecore#//XmlPersistenceUnitValidationModeType">
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitValidationModeType/AUTO"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitValidationModeType/CALLBACK"/>
+      <genEnumLiterals ecoreEnumLiteral="persistence2.ecore#//XmlPersistenceUnitValidationModeType/NONE"/>
     </genEnums>
-    <genClasses ecoreClass="persistence2_0.ecore#//XmlPersistence"/>
-    <genClasses ecoreClass="persistence2_0.ecore#//XmlPersistenceUnit">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence2_0.ecore#//XmlPersistenceUnit/sharedCacheMode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence2_0.ecore#//XmlPersistenceUnit/validationMode"/>
+    <genClasses ecoreClass="persistence2.ecore#//XmlPersistence"/>
+    <genClasses ecoreClass="persistence2.ecore#//XmlPersistenceUnit">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence2.ecore#//XmlPersistenceUnit/sharedCacheMode"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute persistence2.ecore#//XmlPersistenceUnit/validationMode"/>
     </genClasses>
   </genPackages>
   <genPackages prefix="Orm" basePackage="org.eclipse.jpt.core.resource" disposableProviderFactory="true"
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jptResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
index 2b92f3a091..2b92f3a091 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/jptResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm2_0.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm2.ecore
index 8c1b80f1d2..2f05228517 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/orm2_0.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/orm2.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt2_0.orm.xmi" nsPrefix="org.eclipse.jpt2_0.core.resource.orm">
+    nsURI="jpt2_0.orm.xmi" nsPrefix="org.eclipse.jpt.core.jpa2.resource.orm">
   <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="orm.ecore#//XmlEntityMappings"/>
   <eClassifiers xsi:type="ecore:EClass" name="XmlPersistenceUnitMetadata" eSuperTypes="orm.ecore#//XmlPersistenceUnitMetadata">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/persistence2_0.ecore b/jpa/plugins/org.eclipse.jpt.core/model/persistence2.ecore
index 05ed0a4a9b..05ed0a4a9b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/persistence2_0.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/persistence2.ecore
diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index 4afc6290a9..f63de16cf5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
@@ -187,7 +187,7 @@
 	  <jpaPlatform
 	        id="generic2_0"
 	        label="%GENERIC2_0_PLATFORM_LABEL"
-	        factoryClass="org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaPlatformFactory"
+	        factoryClass="org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaPlatformFactory"
 	        default="false">
 	  </jpaPlatform>
 		
@@ -312,7 +312,7 @@
 		</resourceFactory>
 		
 		<resourceFactory
-			class="org.eclipse.jpt2_0.core.resource.orm.Orm2_0XmlResourceFactory"
+			class="org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0XmlResourceFactory"
 			isDefault="true">
 			<contentTypeBinding
 				contentTypeId="org.eclipse.jpt.core.content.orm2_0">
@@ -320,7 +320,7 @@
 		</resourceFactory>
 		
 		<resourceFactory
-			class="org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0XmlResourceFactory"
+			class="org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0XmlResourceFactory"
 			isDefault="true">
 			<contentTypeBinding
 				contentTypeId="org.eclipse.jpt.core.content.persistence2_0">
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/Orm2_0ResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/Orm2_0ResourceModelProvider.java
index 4373ed5a8c..0678ce1894 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/Orm2_0ResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/Orm2_0ResourceModelProvider.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal;
+package org.eclipse.jpt.core.internal.jpa2;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.internal.jpa2.resource.orm.Orm2_0XmlResourceProvider;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.internal.resource.orm.Orm2_0XmlResourceProvider;
 
 /**
  * orm.xml
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/Persistence2_0ResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/Persistence2_0ResourceModelProvider.java
index 184fe14fe3..60f78648f3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/Persistence2_0ResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/Persistence2_0ResourceModelProvider.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal;
+package org.eclipse.jpt.core.internal.jpa2;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.internal.jpa2.resource.persistence.Persistence2_0XmlResourceProvider;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.internal.resource.persistence.Persistence2_0XmlResourceProvider;
 
 /**
  * persistence.xml
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/Generic2_0MappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/Generic2_0MappingFileProvider.java
index bc5326cf97..9e43a7a327 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/Generic2_0MappingFileProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/Generic2_0MappingFileProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context;
+package org.eclipse.jpt.core.internal.jpa2.context;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -15,8 +15,8 @@ import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.MappingFileProvider;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
 
 public class Generic2_0MappingFileProvider
 	implements MappingFileProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaEmbeddable.java
index 89d94ddc9e..0e48a0437c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaEmbeddable.java
@@ -7,12 +7,12 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.java;
+package org.eclipse.jpt.core.internal.jpa2.context.java;
 
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaEmbeddable;
-import org.eclipse.jpt2_0.core.MappingKeys2_0;
+import org.eclipse.jpt.core.jpa2.MappingKeys2_0;
 
 
 public class Generic2_0JavaEmbeddable extends AbstractJavaEmbeddable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaPersistentAttribute.java
index 5751d4820d..49efe91bab 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaPersistentAttribute.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.java;
+package org.eclipse.jpt.core.internal.jpa2.context.java;
 
 import org.eclipse.jpt.core.context.AccessType;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaPersistentAttribute;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * EclipseLink 1.1 persistent attribute
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaPersistentType.java
index d986789f3c..8bbe074712 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaPersistentType.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.java;
+package org.eclipse.jpt.core.internal.jpa2.context.java;
 
 import java.util.Iterator;
 import org.eclipse.jpt.core.context.AccessType;
 import org.eclipse.jpt.core.context.PersistentType;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaPersistentType;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 public class Generic2_0JavaPersistentType
 	extends AbstractJavaPersistentType
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaSequenceGenerator.java
index ea5bc64eeb..ede0a02f47 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/java/Generic2_0JavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/java/Generic2_0JavaSequenceGenerator.java
@@ -7,13 +7,13 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.java;
+package org.eclipse.jpt.core.internal.jpa2.context.java;
 
 import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
 import org.eclipse.jpt.core.internal.context.java.AbstractJavaSequenceGenerator;
+import org.eclipse.jpt.core.jpa2.context.SequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
-import org.eclipse.jpt2_0.core.context.SequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.resource.java.SequenceGenerator2_0Annotation;
 
 /**
  *  Generic2_0JavaSequenceGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0EntityMappings.java
index 11ec1ae281..1bc0d93c20 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0EntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0EntityMappings.java
@@ -7,17 +7,17 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
 import org.eclipse.jpt.core.internal.context.orm.AbstractEntityMappings;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmSequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt2_0.core.context.orm.OrmSequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator;
 
 public class Generic2_0EntityMappings
 	extends AbstractEntityMappings
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmBasicMappingProvider.java
index af0ed6f24a..5de5b39008 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmBasicMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmBasicMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlBasic;
 
 public class Generic2_0OrmBasicMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddable.java
index f878c79641..b63b80f22e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddable.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEmbeddable;
-import org.eclipse.jpt2_0.core.MappingKeys2_0;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable;
+import org.eclipse.jpt.core.jpa2.MappingKeys2_0;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable;
 
 
 public class Generic2_0OrmEmbeddable extends AbstractOrmEmbeddable
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddableMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddableMappingProvider.java
index 6da68a7dea..1d579e5021 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddableMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddableMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -16,10 +16,10 @@ import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable;
 
 public class Generic2_0OrmEmbeddableMappingProvider
 	implements OrmTypeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddedIdMappingProvider.java
index 56fb0d1174..99f9433a89 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddedIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddedIdMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId;
 
 public class Generic2_0OrmEmbeddedIdMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddedMappingProvider.java
index 33065d5079..1e313f5061 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEmbeddedMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEmbeddedMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded;
 
 public class Generic2_0OrmEmbeddedMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEntity.java
index e30d37963b..34d7624132 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEntity.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmGeneratorContainer;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEntity;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntity;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity;
 
 public class Generic2_0OrmEntity
 	extends AbstractOrmEntity
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEntityMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEntityMappingProvider.java
index 1a5dddd359..611be7edf5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmEntityMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmEntityMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -16,10 +16,10 @@ import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntity;
 
 public class Generic2_0OrmEntityMappingProvider
 	implements OrmTypeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmIdMapping.java
index fc9c441fb0..ab46cae1f7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmIdMapping.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmGeneratorContainer;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmIdMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlId;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlId;
 
 public class Generic2_0OrmIdMapping extends AbstractOrmIdMapping<XmlId>
 {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmIdMappingProvider.java
index b566925920..08a59ed165 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmIdMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlId;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlId;
 
 public class Generic2_0OrmIdMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmManyToManyMappingProvider.java
index 4b82ee06b1..8fa82d0a80 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmManyToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmManyToManyMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany;
 
 public class Generic2_0OrmManyToManyMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmManyToOneMappingProvider.java
index f2b3fff7b1..f81731dbed 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmManyToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmManyToOneMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne;
 
 public class Generic2_0OrmManyToOneMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmMappedSuperclassMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmMappedSuperclassMappingProvider.java
index 531c582daa..6066832913 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmMappedSuperclassMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmMappedSuperclassMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -16,11 +16,11 @@ import org.eclipse.jpt.core.MappingKeys;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass;
 
 public class Generic2_0OrmMappedSuperclassMappingProvider
 	implements OrmTypeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmNullAttributeMappingProvider.java
index 15b2282048..786d7e5639 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmNullAttributeMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmNullAttributeMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -18,9 +18,9 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
 
 public class Generic2_0OrmNullAttributeMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmOneToManyMappingProvider.java
index bbeeaf4e5f..4e87602588 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmOneToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmOneToManyMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany;
 
 public class Generic2_0OrmOneToManyMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmOneToOneMappingProvider.java
index 10ebb4d69d..0db23bffb8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmOneToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmOneToOneMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne;
 
 public class Generic2_0OrmOneToOneMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmPersistentAttribute.java
index eecee561bc..af572a7697 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmPersistentAttribute.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.AccessType;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmPersistentType.java
index e81494fabf..091751dfd0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmPersistentType.java
@@ -7,20 +7,20 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import java.util.Iterator;
 import org.eclipse.jpt.core.context.AccessType;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmPersistentType;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.orm.Attributes;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping;
 
 public class Generic2_0OrmPersistentType extends AbstractOrmPersistentType
 {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmSequenceGenerator.java
index 3e2a681d5c..43e7ec6d0c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmSequenceGenerator.java
@@ -7,12 +7,12 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.XmlContextNode;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmSequenceGenerator;
-import org.eclipse.jpt2_0.core.context.orm.OrmSequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmSequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator;
 
 /**
  *  Generic2_0OrmSequenceGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmTransientMappingProvider.java
index a19e73b0be..6e2d28b7a3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmTransientMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmTransientMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlTransient;
 
 public class Generic2_0OrmTransientMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmVersionMappingProvider.java
index 3d0079b9ae..60b5766a3b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmVersionMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmVersionMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -19,10 +19,10 @@ import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlVersion;
 
 public class Generic2_0OrmVersionMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmXml.java
index a1c080f1e0..939ba838b4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0OrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0OrmXml.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXml;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaFactory;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaFactory;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
 
 public class Generic2_0OrmXml
 	extends AbstractOrmXml
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0PersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0PersistenceUnitMetadata.java
index cee9a13b15..2ddc884128 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0PersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0PersistenceUnitMetadata.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.internal.context.orm.AbstractPersistenceUnitMetadata;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata;
 
 public class Generic2_0PersistenceUnitMetadata extends AbstractPersistenceUnitMetadata
 {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlBasic.java
index 4b62c9f14b..dc40d75afe 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlBasic.java
@@ -7,18 +7,18 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaBasicMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlBasic;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.EnumType;
 import org.eclipse.jpt.core.resource.orm.FetchType;
 import org.eclipse.jpt.core.resource.orm.TemporalType;
 import org.eclipse.jpt.core.resource.orm.XmlColumn;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlBasic;
 /**
  * VirtualBasic is an implementation of Basic used when there is 
  * no tag in the orm.xml and an underlying javaBasicMapping exists.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlEmbedded.java
index 9b5f10b2f4..f6aaeddc17 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlEmbedded.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlEmbedded;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlEmbeddedId.java
index 905f964949..0471732167 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlEmbeddedId.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlEmbeddedId.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlEmbeddedId;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlId.java
index 5df129ff3c..26c3475a02 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlId.java
@@ -7,11 +7,12 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaIdMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlId;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlId;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.EnumType;
 import org.eclipse.jpt.core.resource.orm.TemporalType;
@@ -20,7 +21,6 @@ import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue;
 import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator;
 import org.eclipse.jpt.core.resource.orm.XmlTableGenerator;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlId;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlManyToMany.java
index b48799797a..1472756944 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlManyToMany.java
@@ -7,12 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlManyToMany;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.CascadeType;
 import org.eclipse.jpt.core.resource.orm.FetchType;
@@ -20,7 +21,6 @@ import org.eclipse.jpt.core.resource.orm.MapKey;
 import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
 import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlManyToOne.java
index d1e772b366..8ad7344dcf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlManyToOne.java
@@ -7,19 +7,19 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlManyToOne;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.CascadeType;
 import org.eclipse.jpt.core.resource.orm.FetchType;
 import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
 import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlNullAttributeMapping.java
index 96970ded4f..e2e8cb9296 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlNullAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlNullAttributeMapping.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlNullAttributeMapping;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping;
 
 /**
  * VirtualVersion is an implementation of Version used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlOneToMany.java
index 962e0ac584..741cecc91e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlOneToMany.java
@@ -7,12 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlOneToMany;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.CascadeType;
 import org.eclipse.jpt.core.resource.orm.FetchType;
@@ -20,7 +21,6 @@ import org.eclipse.jpt.core.resource.orm.MapKey;
 import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
 import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlOneToOne.java
index 5659278f48..e104ec715c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlOneToOne.java
@@ -7,12 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlOneToOne;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.CascadeType;
 import org.eclipse.jpt.core.resource.orm.FetchType;
@@ -20,7 +21,6 @@ import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
 import org.eclipse.jpt.core.resource.orm.XmlJoinTable;
 import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlSequenceGenerator.java
index 849f3ffeef..b12f395f35 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlSequenceGenerator.java
@@ -7,14 +7,14 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaGeneratorContainer;
 import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlSequenceGenerator;
+import org.eclipse.jpt.core.internal.jpa2.context.java.Generic2_0JavaSequenceGenerator;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.internal.context.java.Generic2_0JavaSequenceGenerator;
-import org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator;
 
 /**
  *  Generic2_0VirtualXmlSequenceGenerator
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlTransient.java
index 4adfc8bb2f..b275a61b79 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlTransient.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlTransient.java
@@ -7,14 +7,14 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaTransientMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlTransient;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlTransient;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlVersion.java
index 8d862aa1c2..e556bcbb8d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/context/orm/Generic2_0VirtualXmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/Generic2_0VirtualXmlVersion.java
@@ -7,17 +7,17 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.context.orm;
+package org.eclipse.jpt.core.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaVersionMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.internal.context.orm.VirtualXmlVersion;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.EnumType;
 import org.eclipse.jpt.core.resource.orm.TemporalType;
 import org.eclipse.jpt.core.resource.orm.XmlColumn;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.orm.XmlVersion;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/operations/Orm2_0FileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/operations/Orm2_0FileCreationOperation.java
index 9657ad12cf..92cecba43e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/operations/Orm2_0FileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/operations/Orm2_0FileCreationOperation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.operations;
+package org.eclipse.jpt.core.internal.jpa2.operations;
 
 import java.util.Iterator;
 import org.eclipse.core.commands.ExecutionException;
@@ -26,15 +26,15 @@ import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.context.persistence.Persistence;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.context.persistence.PersistenceXml;
+import org.eclipse.jpt.core.internal.jpa2.resource.orm.Orm2_0XmlResourceProvider;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperties;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.internal.resource.orm.Orm2_0XmlResourceProvider;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults;
-import org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaAnnotationDefinitionProvider.java
index a388ca1724..54fa90402d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaAnnotationDefinitionProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaAnnotationDefinitionProvider.java
@@ -7,10 +7,14 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.platform;
+package org.eclipse.jpt.core.internal.jpa2.platform;
 
 import java.util.List;
 import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.AccessAnnotationDefinition;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.AssociationOverride2_0AnnotationDefinition;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.AssociationOverrides2_0AnnotationDefinition;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.SequenceGenerator2_0AnnotationDefinition;
 import org.eclipse.jpt.core.internal.platform.AbstractJpaAnnotationDefintionProvider;
 import org.eclipse.jpt.core.internal.resource.java.AttributeOverrideAnnotationDefinition;
 import org.eclipse.jpt.core.internal.resource.java.AttributeOverridesAnnotationDefinition;
@@ -52,10 +56,6 @@ import org.eclipse.jpt.core.internal.resource.java.TemporalAnnotationDefinition;
 import org.eclipse.jpt.core.internal.resource.java.TransientAnnotationDefinition;
 import org.eclipse.jpt.core.internal.resource.java.VersionAnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
-import org.eclipse.jpt2_0.core.internal.resource.java.AccessAnnotationDefinition;
-import org.eclipse.jpt2_0.core.internal.resource.java.AssociationOverride2_0AnnotationDefinition;
-import org.eclipse.jpt2_0.core.internal.resource.java.AssociationOverrides2_0AnnotationDefinition;
-import org.eclipse.jpt2_0.core.internal.resource.java.SequenceGenerator2_0AnnotationDefinition;
 
 /**
  * Provides annotations for JPA 2.0, including those in JPA 1.0
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaFactory.java
index 13711271c9..005bc1af66 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.platform;
+package org.eclipse.jpt.core.internal.jpa2.platform;
 
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.PersistentType;
@@ -50,52 +50,52 @@ import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.context.orm.OrmVersionMapping;
 import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
+import org.eclipse.jpt.core.internal.jpa2.context.java.Generic2_0JavaEmbeddable;
+import org.eclipse.jpt.core.internal.jpa2.context.java.Generic2_0JavaPersistentAttribute;
+import org.eclipse.jpt.core.internal.jpa2.context.java.Generic2_0JavaPersistentType;
+import org.eclipse.jpt.core.internal.jpa2.context.java.Generic2_0JavaSequenceGenerator;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0EntityMappings;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmEmbeddable;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmPersistentAttribute;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmPersistentType;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmSequenceGenerator;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmXml;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0PersistenceUnitMetadata;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlBasic;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlEmbedded;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlEmbeddedId;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlId;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlManyToMany;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlManyToOne;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlNullAttributeMapping;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlOneToMany;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlOneToOne;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlTransient;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0VirtualXmlVersion;
 import org.eclipse.jpt.core.internal.platform.GenericJpaFactory;
+import org.eclipse.jpt.core.jpa2.context.orm.OrmSequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlId;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.orm.XmlGeneratorContainer;
 import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
-import org.eclipse.jpt2_0.core.context.orm.OrmSequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.internal.context.java.Generic2_0JavaEmbeddable;
-import org.eclipse.jpt2_0.core.internal.context.java.Generic2_0JavaPersistentAttribute;
-import org.eclipse.jpt2_0.core.internal.context.java.Generic2_0JavaPersistentType;
-import org.eclipse.jpt2_0.core.internal.context.java.Generic2_0JavaSequenceGenerator;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0EntityMappings;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmEmbeddable;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmPersistentAttribute;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmPersistentType;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmSequenceGenerator;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmXml;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0PersistenceUnitMetadata;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlBasic;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlEmbedded;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlEmbeddedId;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlId;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlManyToMany;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlManyToOne;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlNullAttributeMapping;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlOneToMany;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlOneToOne;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlTransient;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0VirtualXmlVersion;
-import org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt2_0.core.resource.orm.XmlBasic;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntity;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt2_0.core.resource.orm.XmlId;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator;
-import org.eclipse.jpt2_0.core.resource.orm.XmlTransient;
-import org.eclipse.jpt2_0.core.resource.orm.XmlVersion;
 
 /**
  * Central class that allows extenders to easily replace implementations of
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaPlatformFactory.java
index 4bb3228f0a..1c087ed4f8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaPlatformFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaPlatformFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.platform;
+package org.eclipse.jpt.core.internal.jpa2.platform;
 
 import org.eclipse.jpt.core.JpaAnnotationProvider;
 import org.eclipse.jpt.core.JpaFactory;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaPlatformProvider.java
index a38cd579d6..241dbb5f1d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/platform/Generic2_0JpaPlatformProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/platform/Generic2_0JpaPlatformProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.platform;
+package org.eclipse.jpt.core.internal.jpa2.platform;
 
 import java.util.List;
 import org.eclipse.jpt.core.JpaPlatformProvider;
@@ -18,24 +18,24 @@ import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider;
 import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.Orm2_0ResourceModelProvider;
+import org.eclipse.jpt.core.internal.jpa2.Persistence2_0ResourceModelProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.Generic2_0MappingFileProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmBasicMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmEmbeddableMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmEmbeddedIdMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmEmbeddedMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmEntityMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmIdMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmManyToManyMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmManyToOneMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmMappedSuperclassMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmNullAttributeMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmOneToManyMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmOneToOneMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmTransientMappingProvider;
+import org.eclipse.jpt.core.internal.jpa2.context.orm.Generic2_0OrmVersionMappingProvider;
 import org.eclipse.jpt.core.internal.platform.AbstractJpaPlatformProvider;
-import org.eclipse.jpt2_0.core.internal.Orm2_0ResourceModelProvider;
-import org.eclipse.jpt2_0.core.internal.Persistence2_0ResourceModelProvider;
-import org.eclipse.jpt2_0.core.internal.context.Generic2_0MappingFileProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmBasicMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmEmbeddableMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmEmbeddedIdMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmEmbeddedMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmEntityMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmIdMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmManyToManyMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmManyToOneMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmMappedSuperclassMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmNullAttributeMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmOneToManyMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmOneToOneMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmTransientMappingProvider;
-import org.eclipse.jpt2_0.core.internal.context.orm.Generic2_0OrmVersionMappingProvider;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AccessAnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AccessAnnotationDefinition.java
index 69edea818a..e2a6692f44 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AccessAnnotationDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AccessAnnotationDefinition.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.binary.BinaryAccessAnnotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.source.SourceAccessAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.internal.resource.java.binary.BinaryAccessAnnotation;
-import org.eclipse.jpt2_0.core.internal.resource.java.source.SourceAccessAnnotation;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * javax.persistence.Access
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AssociationOverride2_0AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AssociationOverride2_0AnnotationDefinition.java
index 018ea6c012..d885db7ebf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AssociationOverride2_0AnnotationDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AssociationOverride2_0AnnotationDefinition.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.binary.BinaryAssociationOverride2_0Annotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.source.SourceAssociationOverride2_0Annotation;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.internal.resource.java.binary.BinaryAssociationOverride2_0Annotation;
-import org.eclipse.jpt2_0.core.internal.resource.java.source.SourceAssociationOverride2_0Annotation;
 
 /**
  * javax.persistence.AssociationOverride
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AssociationOverrides2_0AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AssociationOverrides2_0AnnotationDefinition.java
index aa9b77886d..3d9b6239d1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/AssociationOverrides2_0AnnotationDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/AssociationOverrides2_0AnnotationDefinition.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.binary.BinaryAssociationOverrides2_0Annotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.source.SourceAssociationOverrides2_0Annotation;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.internal.resource.java.binary.BinaryAssociationOverrides2_0Annotation;
-import org.eclipse.jpt2_0.core.internal.resource.java.source.SourceAssociationOverrides2_0Annotation;
 
 /**
  * javax.persistence.AssociationOverrides
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/NullAccessAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/NullAccessAnnotation.java
index 438e74f7c8..56934464b0 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/NullAccessAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/NullAccessAnnotation.java
@@ -7,14 +7,14 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.NullAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * javax.persistence.Access
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/NullAssociationOverrideJoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/NullAssociationOverrideJoinTableAnnotation.java
index eacb768b24..ef40c1d9f8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/NullAssociationOverrideJoinTableAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/NullAssociationOverrideJoinTableAnnotation.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jpt.core.internal.resource.java.NullJoinTableAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember.AnnotationInitializer;
-import org.eclipse.jpt2_0.core.resource.java.AssociationOverride2_0Annotation;
 
 /**
  * javax.persistence.JoinTable found in a javax.persistence.AssociationOverride annotation
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/SequenceGenerator2_0AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationDefinition.java
index 74440c0b27..4efd835771 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/SequenceGenerator2_0AnnotationDefinition.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/SequenceGenerator2_0AnnotationDefinition.java
@@ -7,16 +7,16 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java;
+package org.eclipse.jpt.core.internal.jpa2.resource.java;
 
 import org.eclipse.jdt.core.IAnnotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.binary.BinarySequenceGenerator2_0Annotation;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.source.SourceSequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.AnnotationDefinition;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.internal.resource.java.binary.BinarySequenceGenerator2_0Annotation;
-import org.eclipse.jpt2_0.core.internal.resource.java.source.SourceSequenceGenerator2_0Annotation;
 
 /**
  *  SequenceGenerator2_0AnnotationDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAccessAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAccessAnnotation.java
index bf7d670ac1..c37d93c398 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAccessAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAccessAnnotation.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.binary;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.binary;
 
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.binary.BinaryAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * javax.persistence.Access
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAssociationOverride2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAssociationOverride2_0Annotation.java
index aa95ebafc3..a6af8e8c69 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAssociationOverride2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAssociationOverride2_0Annotation.java
@@ -7,18 +7,18 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.binary;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.binary;
 
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.NullJoinTableAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.binary.BinaryAssociationOverrideAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.binary.BinaryJoinTableAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
+import org.eclipse.jpt.core.jpa2.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember.AnnotationInitializer;
-import org.eclipse.jpt2_0.core.resource.java.AssociationOverride2_0Annotation;
-import org.eclipse.jpt2_0.core.resource.java.JPA;
 
 /**
  *  BinarySequenceGenerator2_0Annotation
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAssociationOverrides2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAssociationOverrides2_0Annotation.java
index 0f4bda7003..d47f13bc82 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinaryAssociationOverrides2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinaryAssociationOverrides2_0Annotation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.binary;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.binary;
 
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.binary.BinaryAssociationOverridesAnnotation;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinarySequenceGenerator2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinarySequenceGenerator2_0Annotation.java
index c9969f24a6..91287fc879 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/binary/BinarySequenceGenerator2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/binary/BinarySequenceGenerator2_0Annotation.java
@@ -7,15 +7,15 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.binary;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.binary;
 
 import org.eclipse.jdt.core.IAnnotation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.binary.BinarySequenceGeneratorAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.utility.TextRange;
-import org.eclipse.jpt2_0.core.resource.java.SequenceGenerator2_0Annotation;
 
 /**
  *  BinarySequenceGenerator2_0Annotation
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAccessAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAccessAnnotation.java
index 8db69ba0ab..af05638f0e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAccessAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAccessAnnotation.java
@@ -7,13 +7,14 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.source;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.source;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.source.SourceAnnotation;
 import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotationElementAdapter;
 import org.eclipse.jpt.core.internal.utility.jdt.ShortCircuitAnnotationElementAdapter;
 import org.eclipse.jpt.core.internal.utility.jdt.SimpleDeclarationAnnotationAdapter;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember;
@@ -22,7 +23,6 @@ import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
 import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * javax.persistence.Access
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAssociationOverride2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAssociationOverride2_0Annotation.java
index e6d6443a7c..dfc227ab48 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAssociationOverride2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAssociationOverride2_0Annotation.java
@@ -7,15 +7,18 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.source;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.source;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jpt.core.internal.jpa2.resource.java.NullAssociationOverrideJoinTableAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.source.SourceAssociationOverrideAnnotation;
 import org.eclipse.jpt.core.internal.resource.java.source.SourceJoinTableAnnotation;
 import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter;
 import org.eclipse.jpt.core.internal.utility.jdt.MemberIndexedAnnotationAdapter;
 import org.eclipse.jpt.core.internal.utility.jdt.NestedDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.internal.utility.jdt.NestedIndexedDeclarationAnnotationAdapter;
+import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
+import org.eclipse.jpt.core.jpa2.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
@@ -26,9 +29,6 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.utility.jdt.IndexedAnnotationAdapter;
 import org.eclipse.jpt.core.utility.jdt.IndexedDeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.internal.resource.java.NullAssociationOverrideJoinTableAnnotation;
-import org.eclipse.jpt2_0.core.resource.java.AssociationOverride2_0Annotation;
-import org.eclipse.jpt2_0.core.resource.java.JPA;
 
 /**
  *  SourceSequenceGenerator2_0Annotation
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAssociationOverrides2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAssociationOverrides2_0Annotation.java
index 472a01d30e..62dead13dc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceAssociationOverrides2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceAssociationOverrides2_0Annotation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.source;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.source;
 
 import org.eclipse.jpt.core.internal.resource.java.source.SourceAssociationOverridesAnnotation;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceSequenceGenerator2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceSequenceGenerator2_0Annotation.java
index 3b18323e24..a274ab4630 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/java/source/SourceSequenceGenerator2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/java/source/SourceSequenceGenerator2_0Annotation.java
@@ -7,17 +7,17 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.java.source;
+package org.eclipse.jpt.core.internal.jpa2.resource.java.source;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.source.SourceSequenceGeneratorAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.JPA;
+import org.eclipse.jpt.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.core.utility.jdt.AnnotationElementAdapter;
 import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationElementAdapter;
 import org.eclipse.jpt.core.utility.jdt.Member;
-import org.eclipse.jpt2_0.core.resource.java.JPA;
-import org.eclipse.jpt2_0.core.resource.java.SequenceGenerator2_0Annotation;
 
 /**
  *  SourceSequenceGenerator2_0Annotation
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/orm/Orm2_0XmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/orm/Orm2_0XmlResourceProvider.java
index 1a157c36d4..ff0944858c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/orm/Orm2_0XmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/orm/Orm2_0XmlResourceProvider.java
@@ -7,17 +7,17 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.orm;
+package org.eclipse.jpt.core.internal.jpa2.resource.orm;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.jpa2.resource.orm.JPA;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt2_0.core.resource.orm.JPA;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
 
 public class Orm2_0XmlResourceProvider
 	extends AbstractXmlResourceProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/persistence/Persistence2_0XmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/persistence/Persistence2_0XmlResourceProvider.java
index 5e22a91573..ae741f00de 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/internal/resource/persistence/Persistence2_0XmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/resource/persistence/Persistence2_0XmlResourceProvider.java
@@ -7,18 +7,18 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.internal.resource.persistence;
+package org.eclipse.jpt.core.internal.jpa2.resource.persistence;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.core.JptCorePlugin;
+import org.eclipse.jpt.core.jpa2.resource.persistence.JPA;
+import org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence;
+import org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
-import org.eclipse.jpt2_0.core.resource.persistence.JPA;
-import org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Factory;
-import org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence;
-import org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit;
 
 public class Persistence2_0XmlResourceProvider
 	extends AbstractXmlResourceProvider
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryPersistentAttribute.java
index 8d4380a016..c2e7c83e60 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/binary/BinaryPersistentAttribute.java
@@ -27,6 +27,7 @@ import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.Signature;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.internal.utility.jdt.JPTTools;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
@@ -36,7 +37,6 @@ import org.eclipse.jpt.utility.internal.ClassTools;
 import org.eclipse.jpt.utility.internal.NameTools;
 import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * binary persistent attribute (field or property)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourcePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourcePersistentAttribute.java
index d2d47a7810..0938933523 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourcePersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/source/SourcePersistentAttribute.java
@@ -23,6 +23,7 @@ import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jpt.core.internal.utility.jdt.JDTFieldAttribute;
 import org.eclipse.jpt.core.internal.utility.jdt.JDTMethodAttribute;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.Annotation;
 import org.eclipse.jpt.core.resource.java.JavaResourceCompilationUnit;
@@ -35,7 +36,6 @@ import org.eclipse.jpt.utility.MethodSignature;
 import org.eclipse.jpt.utility.internal.ClassTools;
 import org.eclipse.jpt.utility.internal.iterators.CloneIterator;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 /**
  * Java source persistent attribute (field or property)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/MappingKeys2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/MappingKeys2_0.java
index d08ce97538..c876706173 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/MappingKeys2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/MappingKeys2_0.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core;
+package org.eclipse.jpt.core.jpa2;
 
 /**
  * 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/context/SequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/SequenceGenerator2_0.java
index 6daa32cd5e..fd207f3e76 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/context/SequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/SequenceGenerator2_0.java
@@ -7,7 +7,7 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.context;
+package org.eclipse.jpt.core.jpa2.context;
 
 import org.eclipse.jpt.core.context.SequenceGenerator;
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/context/orm/OrmSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmSequenceGenerator2_0.java
index 35523936d9..8138309207 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/context/orm/OrmSequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmSequenceGenerator2_0.java
@@ -7,10 +7,10 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.context.orm;
+package org.eclipse.jpt.core.jpa2.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
-import org.eclipse.jpt2_0.core.context.SequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.context.SequenceGenerator2_0;
 
 /**
  *  SequenceGenerator2_0
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/AccessAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/AccessAnnotation.java
index 080e18429e..06db826f62 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/AccessAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/AccessAnnotation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.java;
+package org.eclipse.jpt.core.jpa2.resource.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.resource.java.AccessType;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/AssociationOverride2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/AssociationOverride2_0Annotation.java
index dcb03f63c0..a0de1c1245 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/AssociationOverride2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/AssociationOverride2_0Annotation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.java;
+package org.eclipse.jpt.core.jpa2.resource.java;
 
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/JPA.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/JPA.java
index 95184b0d54..96e65a286c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/JPA.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/JPA.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.java;
+package org.eclipse.jpt.core.jpa2.resource.java;
 
 /**
  * JPA Java-related stuff (annotations etc.)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/SequenceGenerator2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/SequenceGenerator2_0Annotation.java
index 4f9656fcef..861d67a882 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/java/SequenceGenerator2_0Annotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/java/SequenceGenerator2_0Annotation.java
@@ -7,7 +7,7 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.java;
+package org.eclipse.jpt.core.jpa2.resource.java;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Attributes.java
index 1348c1f3a3..c6393a5e84 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Attributes.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Attributes.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -36,12 +36,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.Attributes#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.Attributes#getElementCollections <em>Element Collections</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getElementCollections <em>Element Collections</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getAttributes()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getAttributes()
  * @model kind="class"
  * @generated
  */
@@ -108,7 +108,7 @@ public class Attributes extends org.eclipse.jpt.core.resource.orm.Attributes
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getAttributes_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getAttributes_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -118,7 +118,7 @@ public class Attributes extends org.eclipse.jpt.core.resource.orm.Attributes
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -135,7 +135,7 @@ public class Attributes extends org.eclipse.jpt.core.resource.orm.Attributes
 
 	/**
 	 * Returns the value of the '<em><b>Element Collections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection}.
+	 * The list contents are of type {@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Element Collections</em>' containment reference list isn't clear,
@@ -143,7 +143,7 @@ public class Attributes extends org.eclipse.jpt.core.resource.orm.Attributes
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Element Collections</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getAttributes_ElementCollections()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getAttributes_ElementCollections()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EntityListener.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EntityListener.java
index 7218188cbd..cf0b022612 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EntityListener.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EntityListener.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -27,11 +27,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListener()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListener()
  * @model kind="class"
  * @generated
  */
@@ -88,7 +88,7 @@ public class EntityListener extends org.eclipse.jpt.core.resource.orm.EntityList
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListener_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListener_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -98,7 +98,7 @@ public class EntityListener extends org.eclipse.jpt.core.resource.orm.EntityList
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EntityListeners.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EntityListeners.java
index 5e426afd1a..693ccfcda7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EntityListeners.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EntityListeners.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -21,7 +21,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListeners()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListeners()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EventMethod.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EventMethod.java
index 71a9574264..0fd5acd028 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/EventMethod.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/EventMethod.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 /**
  * <!-- begin-user-doc -->
@@ -17,11 +17,11 @@ package org.eclipse.jpt2_0.core.resource.orm;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod()
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
@@ -38,14 +38,14 @@ public interface EventMethod extends org.eclipse.jpt.core.resource.orm.EventMeth
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/JPA.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/JPA.java
index cfe7a2eeac..ce5bfa4f29 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/JPA.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/JPA.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 /**
  * JPA persistence2_0.xml-related stuff (elements, attributes etc.)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/LockModeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/LockModeType.java
index 8eec840f3d..e346ac50e2 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/LockModeType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/LockModeType.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Lock Mode Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getLockModeType()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getLockModeType()
  * @model
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0Factory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0Factory.java
index c64e889724..8b21b9d1e5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0Factory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0Factory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package
  * @generated
  */
 public class Orm2_0Factory extends EFactoryImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0Package.java
index bc86387683..9704b41706 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0Package.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 
+import org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package;
 import org.eclipse.jpt.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-import org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,7 +35,7 @@ import org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Factory
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory
  * @model kind="package"
  * @generated
  */
@@ -63,7 +63,7 @@ public class Orm2_0Package extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt2_0.core.resource.orm";
+	public static final String eNS_PREFIX = "org.eclipse.jpt.core.jpa2.resource.orm";
 
 	/**
 	 * The singleton instance of the package.
@@ -71,14 +71,14 @@ public class Orm2_0Package extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final Orm2_0Package eINSTANCE = org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package.init();
+	public static final Orm2_0Package eINSTANCE = org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntityMappings()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntityMappings()
 	 * @generated
 	 */
 	public static final int XML_ENTITY_MAPPINGS = 0;
@@ -228,11 +228,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = OrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE_UNIT_METADATA = 1;
@@ -274,11 +274,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_PERSISTENCE_UNIT_METADATA_FEATURE_COUNT = OrmPackage.XML_PERSISTENCE_UNIT_METADATA_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE_UNIT_DEFAULTS = 2;
@@ -356,11 +356,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT = OrmPackage.XML_PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntity
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntity()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntity()
 	 * @generated
 	 */
 	public static final int XML_ENTITY = 3;
@@ -654,11 +654,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ENTITY_FEATURE_COUNT = OrmPackage.XML_ENTITY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
 	 * @generated
 	 */
 	public static final int XML_MAPPED_SUPERCLASS = 4;
@@ -817,11 +817,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = OrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddable()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDABLE = 5;
@@ -881,11 +881,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_EMBEDDABLE_FEATURE_COUNT = OrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes <em>Attributes</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes <em>Attributes</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Attributes
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getAttributes()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Attributes
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getAttributes()
 	 * @generated
 	 */
 	public static final int ATTRIBUTES = 6;
@@ -1008,11 +1008,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int ATTRIBUTES_FEATURE_COUNT = OrmPackage.ATTRIBUTES_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeMapping()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeMapping()
 	 * @generated
 	 */
 	public static final int XML_ATTRIBUTE_MAPPING = 7;
@@ -1045,11 +1045,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ATTRIBUTE_MAPPING_FEATURE_COUNT = OrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection()
 	 * @generated
 	 */
 	public static final int XML_ELEMENT_COLLECTION = 8;
@@ -1244,11 +1244,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ELEMENT_COLLECTION_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 19;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlId <em>Xml Id</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlId <em>Xml Id</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlId()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlId
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlId()
 	 * @generated
 	 */
 	public static final int XML_ID = 9;
@@ -1344,11 +1344,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ID_FEATURE_COUNT = OrmPackage.XML_ID_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddedId()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddedId()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDED_ID = 10;
@@ -1390,11 +1390,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_EMBEDDED_ID_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbedded()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbedded()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDED = 11;
@@ -1445,11 +1445,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_EMBEDDED_FEATURE_COUNT = OrmPackage.XML_EMBEDDED_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlBasic()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlBasic()
 	 * @generated
 	 */
 	public static final int XML_BASIC = 12;
@@ -1536,11 +1536,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_BASIC_FEATURE_COUNT = OrmPackage.XML_BASIC_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion <em>Xml Version</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlVersion()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlVersion()
 	 * @generated
 	 */
 	public static final int XML_VERSION = 13;
@@ -1609,11 +1609,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_VERSION_FEATURE_COUNT = OrmPackage.XML_VERSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToOne()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToOne()
 	 * @generated
 	 */
 	public static final int XML_MANY_TO_ONE = 14;
@@ -1718,11 +1718,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MANY_TO_ONE_FEATURE_COUNT = OrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany()
 	 * @generated
 	 */
 	public static final int XML_ONE_TO_MANY = 15;
@@ -1899,11 +1899,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ONE_TO_MANY_FEATURE_COUNT = OrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 9;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne()
 	 * @generated
 	 */
 	public static final int XML_ONE_TO_ONE = 16;
@@ -2035,11 +2035,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ONE_TO_ONE_FEATURE_COUNT = OrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany()
 	 * @generated
 	 */
 	public static final int XML_MANY_TO_MANY = 17;
@@ -2198,11 +2198,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MANY_TO_MANY_FEATURE_COUNT = OrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 8;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTransient
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTransient()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTransient()
 	 * @generated
 	 */
 	public static final int XML_TRANSIENT = 18;
@@ -2235,11 +2235,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_TRANSIENT_FEATURE_COUNT = OrmPackage.XML_TRANSIENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAssociationOverride()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAssociationOverride()
 	 * @generated
 	 */
 	public static final int XML_ASSOCIATION_OVERRIDE = 19;
@@ -2290,11 +2290,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeOverride()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeOverride()
 	 * @generated
 	 */
 	public static final int XML_ATTRIBUTE_OVERRIDE = 20;
@@ -2336,11 +2336,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ATTRIBUTE_OVERRIDE_FEATURE_COUNT = OrmPackage.XML_ATTRIBUTE_OVERRIDE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListeners
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListeners()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListeners()
 	 * @generated
 	 */
 	public static final int ENTITY_LISTENERS = 21;
@@ -2364,11 +2364,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int ENTITY_LISTENERS_FEATURE_COUNT = OrmPackage.ENTITY_LISTENERS_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener <em>Entity Listener</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener <em>Entity Listener</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListener
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListener()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListener
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListener()
 	 * @generated
 	 */
 	public static final int ENTITY_LISTENER = 22;
@@ -2464,11 +2464,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int ENTITY_LISTENER_FEATURE_COUNT = OrmPackage.ENTITY_LISTENER_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery <em>Xml Query</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQuery
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery()
 	 * @generated
 	 */
 	public static final int XML_QUERY = 23;
@@ -2519,11 +2519,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_QUERY_FEATURE_COUNT = OrmPackage.XML_QUERY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
 	 * @generated
 	 */
 	public static final int XML_NAMED_NATIVE_QUERY = 24;
@@ -2592,11 +2592,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_NAMED_NATIVE_QUERY_FEATURE_COUNT = OrmPackage.XML_NAMED_NATIVE_QUERY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedQuery()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedQuery()
 	 * @generated
 	 */
 	public static final int XML_NAMED_QUERY = 25;
@@ -2656,11 +2656,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_NAMED_QUERY_FEATURE_COUNT = OrmPackage.XML_NAMED_QUERY_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlGenerator
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator()
 	 * @generated
 	 */
 	public static final int XML_GENERATOR = 26;
@@ -2711,11 +2711,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_GENERATOR_FEATURE_COUNT = OrmPackage.XML_GENERATOR_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
 	 * @generated
 	 */
 	public static final int XML_SEQUENCE_GENERATOR = 27;
@@ -2793,11 +2793,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_SEQUENCE_GENERATOR_FEATURE_COUNT = OrmPackage.XML_SEQUENCE_GENERATOR_FEATURE_COUNT + 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTableGenerator()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTableGenerator()
 	 * @generated
 	 */
 	public static final int XML_TABLE_GENERATOR = 28;
@@ -2911,11 +2911,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_TABLE_GENERATOR_FEATURE_COUNT = OrmPackage.XML_TABLE_GENERATOR_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getSqlResultSetMapping()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getSqlResultSetMapping()
 	 * @generated
 	 */
 	public static final int SQL_RESULT_SET_MAPPING = 29;
@@ -2966,11 +2966,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int SQL_RESULT_SET_MAPPING_FEATURE_COUNT = OrmPackage.SQL_RESULT_SET_MAPPING_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod <em>Event Method</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod <em>Event Method</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EventMethod
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EventMethod
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod()
 	 * @generated
 	 */
 	public static final int EVENT_METHOD = 30;
@@ -3003,11 +3003,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int EVENT_METHOD_FEATURE_COUNT = OrmPackage.EVENT_METHOD_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostLoad <em>Post Load</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostLoad <em>Post Load</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostLoad
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostLoad()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostLoad
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostLoad()
 	 * @generated
 	 */
 	public static final int POST_LOAD = 31;
@@ -3040,11 +3040,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int POST_LOAD_FEATURE_COUNT = OrmPackage.POST_LOAD_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostPersist <em>Post Persist</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostPersist
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostPersist()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostPersist
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostPersist()
 	 * @generated
 	 */
 	public static final int POST_PERSIST = 32;
@@ -3077,11 +3077,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int POST_PERSIST_FEATURE_COUNT = OrmPackage.POST_PERSIST_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostRemove <em>Post Remove</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostRemove
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostRemove()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostRemove
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostRemove()
 	 * @generated
 	 */
 	public static final int POST_REMOVE = 33;
@@ -3114,11 +3114,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int POST_REMOVE_FEATURE_COUNT = OrmPackage.POST_REMOVE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate <em>Post Update</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostUpdate
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostUpdate()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostUpdate()
 	 * @generated
 	 */
 	public static final int POST_UPDATE = 34;
@@ -3151,11 +3151,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int POST_UPDATE_FEATURE_COUNT = OrmPackage.POST_UPDATE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PrePersist <em>Pre Persist</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PrePersist
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPrePersist()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PrePersist
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPrePersist()
 	 * @generated
 	 */
 	public static final int PRE_PERSIST = 35;
@@ -3188,11 +3188,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int PRE_PERSIST_FEATURE_COUNT = OrmPackage.PRE_PERSIST_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreRemove <em>Pre Remove</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PreRemove
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreRemove()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreRemove
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreRemove()
 	 * @generated
 	 */
 	public static final int PRE_REMOVE = 36;
@@ -3225,11 +3225,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int PRE_REMOVE_FEATURE_COUNT = OrmPackage.PRE_REMOVE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate <em>Pre Update</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PreUpdate
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreUpdate()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreUpdate()
 	 * @generated
 	 */
 	public static final int PRE_UPDATE = 37;
@@ -3262,11 +3262,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int PRE_UPDATE_FEATURE_COUNT = OrmPackage.PRE_UPDATE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQueryHint()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQueryHint()
 	 * @generated
 	 */
 	public static final int XML_QUERY_HINT = 38;
@@ -3308,11 +3308,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_QUERY_HINT_FEATURE_COUNT = OrmPackage.XML_QUERY_HINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlCollectionTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlCollectionTable()
 	 * @generated
 	 */
 	public static final int XML_COLLECTION_TABLE = 39;
@@ -3372,11 +3372,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_COLLECTION_TABLE_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_TABLE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn()
 	 * @generated
 	 */
 	public static final int XML_ORDER_COLUMN = 40;
@@ -3445,11 +3445,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_ORDER_COLUMN_FEATURE_COUNT = OrmPackage.ABSTRACT_XML_NAMED_COLUMN_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
 	 * @generated
 	 */
 	public static final int XML_MAP_KEY_COLUMN = 41;
@@ -3554,11 +3554,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MAP_KEY_COLUMN_FEATURE_COUNT = OrmPackage.XML_COLUMN_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
 	 * @generated
 	 */
 	public static final int XML_MAP_KEY_JOIN_COLUMN = 42;
@@ -3645,11 +3645,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MAP_KEY_JOIN_COLUMN_FEATURE_COUNT = OrmPackage.XML_JOIN_COLUMN_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyClass()
 	 * @generated
 	 */
 	public static final int XML_MAP_KEY_CLASS = 43;
@@ -3673,11 +3673,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_MAP_KEY_CLASS_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
 	 * @generated
 	 */
 	public static final int XML_UNIQUE_CONSTRAINT = 44;
@@ -3710,11 +3710,11 @@ public class Orm2_0Package extends EPackageImpl
 	public static final int XML_UNIQUE_CONSTRAINT_FEATURE_COUNT = OrmPackage.XML_UNIQUE_CONSTRAINT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.orm.LockModeType <em>Lock Mode Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.LockModeType <em>Lock Mode Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.orm.LockModeType
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getLockModeType()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.LockModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getLockModeType()
 	 * @generated
 	 */
 	public static final int LOCK_MODE_TYPE = 45;
@@ -4052,7 +4052,7 @@ public class Orm2_0Package extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#eNS_URI
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -4121,11 +4121,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Entity Mappings</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings
 	 * @generated
 	 */
 	public EClass getXmlEntityMappings()
@@ -4134,11 +4134,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Persistence Unit Metadata</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata
 	 * @generated
 	 */
 	public EClass getXmlPersistenceUnitMetadata()
@@ -4147,11 +4147,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata#getDescription()
 	 * @see #getXmlPersistenceUnitMetadata()
 	 * @generated
 	 */
@@ -4161,11 +4161,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Persistence Unit Defaults</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults
 	 * @generated
 	 */
 	public EClass getXmlPersistenceUnitDefaults()
@@ -4174,11 +4174,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#getDescription()
 	 * @see #getXmlPersistenceUnitDefaults()
 	 * @generated
 	 */
@@ -4188,11 +4188,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Delimited Identifiers</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers()
 	 * @see #getXmlPersistenceUnitDefaults()
 	 * @generated
 	 */
@@ -4203,11 +4203,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity <em>Xml Entity</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity <em>Xml Entity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Entity</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntity
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity
 	 * @generated
 	 */
 	public EClass getXmlEntity()
@@ -4217,11 +4217,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Cacheable</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntity#isCacheable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity#isCacheable()
 	 * @see #getXmlEntity()
 	 * @generated
 	 */
@@ -4232,11 +4232,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Mapped Superclass</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass
 	 * @generated
 	 */
 	public EClass getXmlMappedSuperclass()
@@ -4246,11 +4246,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embeddable</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable
 	 * @generated
 	 */
 	public EClass getXmlEmbeddable()
@@ -4260,11 +4260,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes <em>Attributes</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes <em>Attributes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Attributes</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Attributes
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Attributes
 	 * @generated
 	 */
 	public EClass getAttributes()
@@ -4273,11 +4273,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Attributes#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getDescription()
 	 * @see #getAttributes()
 	 * @generated
 	 */
@@ -4287,11 +4287,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes#getElementCollections <em>Element Collections</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getElementCollections <em>Element Collections</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Element Collections</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Attributes#getElementCollections()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Attributes#getElementCollections()
 	 * @see #getAttributes()
 	 * @generated
 	 */
@@ -4301,11 +4301,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Attribute Mapping</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping
 	 * @generated
 	 */
 	public EClass getXmlAttributeMapping()
@@ -4314,11 +4314,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Element Collection</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection
 	 * @generated
 	 */
 	public EClass getXmlElementCollection()
@@ -4327,11 +4327,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Target Class</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTargetClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTargetClass()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4342,11 +4342,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Fetch</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getFetch()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getFetch()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4357,11 +4357,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Order By</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderBy()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderBy()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4371,11 +4371,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Order Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderColumn()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4385,11 +4385,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKey()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKey()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4399,11 +4399,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Class</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyClass()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4413,11 +4413,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Temporal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyTemporal()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4427,11 +4427,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Enumerated</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyEnumerated()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4441,11 +4441,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4455,11 +4455,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyColumn()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4469,11 +4469,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Join Columns</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyJoinColumns()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4483,11 +4483,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getColumn <em>Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getColumn <em>Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getColumn()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4497,11 +4497,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Temporal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTemporal()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4511,11 +4511,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Enumerated</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getEnumerated()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4525,11 +4525,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#isLob <em>Lob</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#isLob <em>Lob</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Lob</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#isLob()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#isLob()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4539,11 +4539,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAttributeOverrides <em>Attribute Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAttributeOverrides <em>Attribute Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAttributeOverrides()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4553,11 +4553,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAssociationOverrides <em>Association Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAssociationOverrides <em>Association Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Association Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAssociationOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAssociationOverrides()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4567,11 +4567,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Collection Table</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getCollectionTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getCollectionTable()
 	 * @see #getXmlElementCollection()
 	 * @generated
 	 */
@@ -4582,11 +4582,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlId <em>Xml Id</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlId <em>Xml Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlId
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlId
 	 * @generated
 	 */
 	public EClass getXmlId()
@@ -4595,11 +4595,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embedded Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId
 	 * @generated
 	 */
 	public EClass getXmlEmbeddedId()
@@ -4608,11 +4608,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embedded</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded
 	 * @generated
 	 */
 	public EClass getXmlEmbedded()
@@ -4621,11 +4621,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded#getAssociationOverrides <em>Association Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded#getAssociationOverrides <em>Association Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Association Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded#getAssociationOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded#getAssociationOverrides()
 	 * @see #getXmlEmbedded()
 	 * @generated
 	 */
@@ -4635,11 +4635,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic <em>Xml Basic</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Basic</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlBasic
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic
 	 * @generated
 	 */
 	public EClass getXmlBasic()
@@ -4648,11 +4648,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion <em>Xml Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Version</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlVersion
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion
 	 * @generated
 	 */
 	public EClass getXmlVersion()
@@ -4661,11 +4661,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Many To One</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne
 	 * @generated
 	 */
 	public EClass getXmlManyToOne()
@@ -4674,11 +4674,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Mapped By Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#getMappedById()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#getMappedById()
 	 * @see #getXmlManyToOne()
 	 * @generated
 	 */
@@ -4688,11 +4688,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#isId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#isId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#isId()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#isId()
 	 * @see #getXmlManyToOne()
 	 * @generated
 	 */
@@ -4702,11 +4702,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml One To Many</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany
 	 * @generated
 	 */
 	public EClass getXmlOneToMany()
@@ -4715,11 +4715,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Order Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getOrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getOrderColumn()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4729,11 +4729,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Class</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyClass()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4743,11 +4743,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Temporal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyTemporal()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4757,11 +4757,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Enumerated</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyEnumerated()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4771,11 +4771,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4785,11 +4785,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyColumn()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4799,11 +4799,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Join Columns</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyJoinColumns()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4813,11 +4813,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Orphan Removal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#isOrphanRemoval()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#isOrphanRemoval()
 	 * @see #getXmlOneToMany()
 	 * @generated
 	 */
@@ -4827,11 +4827,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml One To One</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne
 	 * @generated
 	 */
 	public EClass getXmlOneToOne()
@@ -4840,11 +4840,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Orphan Removal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isOrphanRemoval()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isOrphanRemoval()
 	 * @see #getXmlOneToOne()
 	 * @generated
 	 */
@@ -4854,11 +4854,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Mapped By Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#getMappedById()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#getMappedById()
 	 * @see #getXmlOneToOne()
 	 * @generated
 	 */
@@ -4868,11 +4868,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isId <em>Id</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isId()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isId()
 	 * @see #getXmlOneToOne()
 	 * @generated
 	 */
@@ -4882,11 +4882,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Many To Many</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany
 	 * @generated
 	 */
 	public EClass getXmlManyToMany()
@@ -4895,11 +4895,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Order Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getOrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getOrderColumn()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4909,11 +4909,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Class</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyClass()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4923,11 +4923,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Temporal</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyTemporal()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4937,11 +4937,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Map Key Enumerated</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyEnumerated()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4951,11 +4951,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Attribute Overrides</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4965,11 +4965,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Map Key Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyColumn()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4979,11 +4979,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Map Key Join Columns</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyJoinColumns()
 	 * @see #getXmlManyToMany()
 	 * @generated
 	 */
@@ -4993,11 +4993,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTransient <em>Xml Transient</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient <em>Xml Transient</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Transient</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTransient
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient
 	 * @generated
 	 */
 	public EClass getXmlTransient()
@@ -5007,11 +5007,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Association Override</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride
 	 * @generated
 	 */
 	public EClass getXmlAssociationOverride()
@@ -5020,11 +5020,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getDescription()
 	 * @see #getXmlAssociationOverride()
 	 * @generated
 	 */
@@ -5034,11 +5034,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Join Table</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getJoinTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getJoinTable()
 	 * @see #getXmlAssociationOverride()
 	 * @generated
 	 */
@@ -5048,11 +5048,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Attribute Override</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride
 	 * @generated
 	 */
 	public EClass getXmlAttributeOverride()
@@ -5061,11 +5061,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride#getDescription()
 	 * @see #getXmlAttributeOverride()
 	 * @generated
 	 */
@@ -5075,11 +5075,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListeners <em>Entity Listeners</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners <em>Entity Listeners</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Entity Listeners</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListeners
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners
 	 * @generated
 	 */
 	public EClass getEntityListeners()
@@ -5089,11 +5089,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener <em>Entity Listener</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener <em>Entity Listener</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Entity Listener</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListener
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListener
 	 * @generated
 	 */
 	public EClass getEntityListener()
@@ -5102,11 +5102,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListener#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListener#getDescription()
 	 * @see #getEntityListener()
 	 * @generated
 	 */
@@ -5116,11 +5116,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery <em>Xml Query</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery <em>Xml Query</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Query</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery
 	 * @generated
 	 */
 	public EClass getXmlQuery()
@@ -5129,11 +5129,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQuery#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery#getDescription()
 	 * @see #getXmlQuery()
 	 * @generated
 	 */
@@ -5143,11 +5143,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Named Native Query</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery
 	 * @generated
 	 */
 	public EClass getXmlNamedNativeQuery()
@@ -5156,11 +5156,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Named Query</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery
 	 * @generated
 	 */
 	public EClass getXmlNamedQuery()
@@ -5169,11 +5169,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Lock Mode</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery#getLockMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery#getLockMode()
 	 * @see #getXmlNamedQuery()
 	 * @generated
 	 */
@@ -5184,11 +5184,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator <em>Xml Generator</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator <em>Xml Generator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Generator</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator
 	 * @generated
 	 */
 	public EClass getXmlGenerator()
@@ -5197,11 +5197,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlGenerator#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator#getDescription()
 	 * @see #getXmlGenerator()
 	 * @generated
 	 */
@@ -5211,11 +5211,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Sequence Generator</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator
 	 * @generated
 	 */
 	public EClass getXmlSequenceGenerator()
@@ -5224,11 +5224,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Catalog</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getCatalog()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getCatalog()
 	 * @see #getXmlSequenceGenerator()
 	 * @generated
 	 */
@@ -5239,11 +5239,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Schema</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getSchema()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getSchema()
 	 * @see #getXmlSequenceGenerator()
 	 * @generated
 	 */
@@ -5254,11 +5254,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Table Generator</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator
 	 * @generated
 	 */
 	public EClass getXmlTableGenerator()
@@ -5267,11 +5267,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Sql Result Set Mapping</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping
 	 * @generated
 	 */
 	public EClass getSqlResultSetMapping()
@@ -5280,11 +5280,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping#getDescription()
 	 * @see #getSqlResultSetMapping()
 	 * @generated
 	 */
@@ -5294,11 +5294,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod <em>Event Method</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod <em>Event Method</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Event Method</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EventMethod
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EventMethod
 	 * @generated
 	 */
 	public EClass getEventMethod()
@@ -5307,11 +5307,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.EventMethod#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.EventMethod#getDescription()
 	 * @see #getEventMethod()
 	 * @generated
 	 */
@@ -5321,11 +5321,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PostLoad <em>Post Load</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostLoad <em>Post Load</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Post Load</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostLoad
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostLoad
 	 * @generated
 	 */
 	public EClass getPostLoad()
@@ -5334,11 +5334,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PostPersist <em>Post Persist</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostPersist <em>Post Persist</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Post Persist</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostPersist
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostPersist
 	 * @generated
 	 */
 	public EClass getPostPersist()
@@ -5347,11 +5347,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PostRemove <em>Post Remove</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostRemove <em>Post Remove</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Post Remove</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostRemove
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostRemove
 	 * @generated
 	 */
 	public EClass getPostRemove()
@@ -5360,11 +5360,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PostUpdate <em>Post Update</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate <em>Post Update</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Post Update</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PostUpdate
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate
 	 * @generated
 	 */
 	public EClass getPostUpdate()
@@ -5373,11 +5373,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PrePersist <em>Pre Persist</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PrePersist <em>Pre Persist</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Pre Persist</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PrePersist
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PrePersist
 	 * @generated
 	 */
 	public EClass getPrePersist()
@@ -5386,11 +5386,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PreRemove <em>Pre Remove</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreRemove <em>Pre Remove</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Pre Remove</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PreRemove
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreRemove
 	 * @generated
 	 */
 	public EClass getPreRemove()
@@ -5399,11 +5399,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.PreUpdate <em>Pre Update</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate <em>Pre Update</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Pre Update</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.PreUpdate
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate
 	 * @generated
 	 */
 	public EClass getPreUpdate()
@@ -5412,11 +5412,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Query Hint</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint
 	 * @generated
 	 */
 	public EClass getXmlQueryHint()
@@ -5425,11 +5425,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint#getDescription <em>Description</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint#getDescription <em>Description</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint#getDescription()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint#getDescription()
 	 * @see #getXmlQueryHint()
 	 * @generated
 	 */
@@ -5439,11 +5439,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Collection Table</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable
 	 * @generated
 	 */
 	public EClass getXmlCollectionTable()
@@ -5452,11 +5452,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable#getJoinColumns <em>Join Columns</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable#getJoinColumns <em>Join Columns</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference list '<em>Join Columns</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable#getJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable#getJoinColumns()
 	 * @see #getXmlCollectionTable()
 	 * @generated
 	 */
@@ -5466,11 +5466,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Order Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn
 	 * @generated
 	 */
 	public EClass getXmlOrderColumn()
@@ -5479,11 +5479,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Insertable</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getInsertable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getInsertable()
 	 * @see #getXmlOrderColumn()
 	 * @generated
 	 */
@@ -5493,11 +5493,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Nullable</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getNullable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getNullable()
 	 * @see #getXmlOrderColumn()
 	 * @generated
 	 */
@@ -5507,11 +5507,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Updatable</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getUpdatable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getUpdatable()
 	 * @see #getXmlOrderColumn()
 	 * @generated
 	 */
@@ -5521,11 +5521,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getTable <em>Table</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getTable <em>Table</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Table</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getTable()
 	 * @see #getXmlOrderColumn()
 	 * @generated
 	 */
@@ -5535,11 +5535,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Map Key Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn
 	 * @generated
 	 */
 	public EClass getXmlMapKeyColumn()
@@ -5548,11 +5548,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Map Key Join Column</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn
 	 * @generated
 	 */
 	public EClass getXmlMapKeyJoinColumn()
@@ -5561,11 +5561,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Map Key Class</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass
 	 * @generated
 	 */
 	public EClass getXmlMapKeyClass()
@@ -5574,11 +5574,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Class Name</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass#getClassName()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass#getClassName()
 	 * @see #getXmlMapKeyClass()
 	 * @generated
 	 */
@@ -5588,11 +5588,11 @@ public class Orm2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Unique Constraint</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint
 	 * @generated
 	 */
 	public EClass getXmlUniqueConstraint()
@@ -5602,11 +5602,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint#getName()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint#getName()
 	 * @see #getXmlUniqueConstraint()
 	 * @generated
 	 */
@@ -5617,11 +5617,11 @@ public class Orm2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt2_0.core.resource.orm.LockModeType <em>Lock Mode Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.jpa2.resource.orm.LockModeType <em>Lock Mode Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Lock Mode Type</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.LockModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.LockModeType
 	 * @generated
 	 */
 	public EEnum getLockModeType()
@@ -6105,21 +6105,21 @@ public class Orm2_0Package extends EPackageImpl
 	public interface Literals
 	{
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntityMappings()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntityMappings()
 		 * @generated
 		 */
 		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata <em>Xml Persistence Unit Metadata</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
 		 * @generated
 		 */
 		public static final EClass XML_PERSISTENCE_UNIT_METADATA = eINSTANCE.getXmlPersistenceUnitMetadata();
@@ -6133,11 +6133,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_PERSISTENCE_UNIT_METADATA__DESCRIPTION = eINSTANCE.getXmlPersistenceUnitMetadata_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults <em>Xml Persistence Unit Defaults</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
 		 * @generated
 		 */
 		public static final EClass XML_PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getXmlPersistenceUnitDefaults();
@@ -6159,11 +6159,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_PERSISTENCE_UNIT_DEFAULTS__DELIMITED_IDENTIFIERS = eINSTANCE.getXmlPersistenceUnitDefaults_DelimitedIdentifiers();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEntity
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntity()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntity()
 		 * @generated
 		 */
 		public static final EClass XML_ENTITY = eINSTANCE.getXmlEntity();
@@ -6177,31 +6177,31 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_ENTITY__CACHEABLE = eINSTANCE.getXmlEntity_Cacheable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMappedSuperclass
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMappedSuperclass
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
 		 * @generated
 		 */
 		public static final EClass XML_MAPPED_SUPERCLASS = eINSTANCE.getXmlMappedSuperclass();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddable
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddable()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddable
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddable()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDABLE = eINSTANCE.getXmlEmbeddable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.Attributes <em>Attributes</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.Attributes <em>Attributes</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Attributes
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getAttributes()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Attributes
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getAttributes()
 		 * @generated
 		 */
 		public static final EClass ATTRIBUTES = eINSTANCE.getAttributes();
@@ -6223,21 +6223,21 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference ATTRIBUTES__ELEMENT_COLLECTIONS = eINSTANCE.getAttributes_ElementCollections();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeMapping
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeMapping()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeMapping
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeMapping()
 		 * @generated
 		 */
 		public static final EClass XML_ATTRIBUTE_MAPPING = eINSTANCE.getXmlAttributeMapping();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection <em>Xml Element Collection</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection()
 		 * @generated
 		 */
 		public static final EClass XML_ELEMENT_COLLECTION = eINSTANCE.getXmlElementCollection();
@@ -6387,31 +6387,31 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference XML_ELEMENT_COLLECTION__COLLECTION_TABLE = eINSTANCE.getXmlElementCollection_CollectionTable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlId <em>Xml Id</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlId <em>Xml Id</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlId()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlId
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlId()
 		 * @generated
 		 */
 		public static final EClass XML_ID = eINSTANCE.getXmlId();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddedId()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddedId()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbedded()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbedded()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
@@ -6425,31 +6425,31 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference XML_EMBEDDED__ASSOCIATION_OVERRIDES = eINSTANCE.getXmlEmbedded_AssociationOverrides();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlBasic()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlBasic()
 		 * @generated
 		 */
 		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion <em>Xml Version</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlVersion()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlVersion()
 		 * @generated
 		 */
 		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToOne()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToOne()
 		 * @generated
 		 */
 		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
@@ -6471,11 +6471,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_MANY_TO_ONE__ID = eINSTANCE.getXmlManyToOne_Id();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany()
 		 * @generated
 		 */
 		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
@@ -6545,11 +6545,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_ONE_TO_MANY__ORPHAN_REMOVAL = eINSTANCE.getXmlOneToMany_OrphanRemoval();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne()
 		 * @generated
 		 */
 		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
@@ -6579,11 +6579,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_ONE_TO_ONE__ID = eINSTANCE.getXmlOneToOne_Id();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany()
 		 * @generated
 		 */
 		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
@@ -6645,21 +6645,21 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference XML_MANY_TO_MANY__MAP_KEY_JOIN_COLUMNS = eINSTANCE.getXmlManyToMany_MapKeyJoinColumns();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTransient
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTransient()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTransient()
 		 * @generated
 		 */
 		public static final EClass XML_TRANSIENT = eINSTANCE.getXmlTransient();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride <em>Xml Association Override</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAssociationOverride()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAssociationOverride()
 		 * @generated
 		 */
 		public static final EClass XML_ASSOCIATION_OVERRIDE = eINSTANCE.getXmlAssociationOverride();
@@ -6681,11 +6681,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference XML_ASSOCIATION_OVERRIDE__JOIN_TABLE = eINSTANCE.getXmlAssociationOverride_JoinTable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride <em>Xml Attribute Override</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeOverride()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeOverride()
 		 * @generated
 		 */
 		public static final EClass XML_ATTRIBUTE_OVERRIDE = eINSTANCE.getXmlAttributeOverride();
@@ -6699,21 +6699,21 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_ATTRIBUTE_OVERRIDE__DESCRIPTION = eINSTANCE.getXmlAttributeOverride_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners <em>Entity Listeners</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListeners
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListeners()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListeners
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListeners()
 		 * @generated
 		 */
 		public static final EClass ENTITY_LISTENERS = eINSTANCE.getEntityListeners();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.EntityListener <em>Entity Listener</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EntityListener <em>Entity Listener</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.EntityListener
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEntityListener()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.EntityListener
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEntityListener()
 		 * @generated
 		 */
 		public static final EClass ENTITY_LISTENER = eINSTANCE.getEntityListener();
@@ -6727,11 +6727,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute ENTITY_LISTENER__DESCRIPTION = eINSTANCE.getEntityListener_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery <em>Xml Query</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery <em>Xml Query</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQuery
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery()
 		 * @generated
 		 */
 		public static final EClass XML_QUERY = eINSTANCE.getXmlQuery();
@@ -6745,21 +6745,21 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_QUERY__DESCRIPTION = eINSTANCE.getXmlQuery_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery <em>Xml Named Native Query</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
 		 * @generated
 		 */
 		public static final EClass XML_NAMED_NATIVE_QUERY = eINSTANCE.getXmlNamedNativeQuery();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery <em>Xml Named Query</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedQuery()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedQuery()
 		 * @generated
 		 */
 		public static final EClass XML_NAMED_QUERY = eINSTANCE.getXmlNamedQuery();
@@ -6773,11 +6773,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_NAMED_QUERY__LOCK_MODE = eINSTANCE.getXmlNamedQuery_LockMode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator <em>Xml Generator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlGenerator
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator()
 		 * @generated
 		 */
 		public static final EClass XML_GENERATOR = eINSTANCE.getXmlGenerator();
@@ -6791,11 +6791,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_GENERATOR__DESCRIPTION = eINSTANCE.getXmlGenerator_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator <em>Xml Sequence Generator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
 		 * @generated
 		 */
 		public static final EClass XML_SEQUENCE_GENERATOR = eINSTANCE.getXmlSequenceGenerator();
@@ -6817,21 +6817,21 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_SEQUENCE_GENERATOR__SCHEMA = eINSTANCE.getXmlSequenceGenerator_Schema();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator <em>Xml Table Generator</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTableGenerator()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTableGenerator()
 		 * @generated
 		 */
 		public static final EClass XML_TABLE_GENERATOR = eINSTANCE.getXmlTableGenerator();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getSqlResultSetMapping()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getSqlResultSetMapping()
 		 * @generated
 		 */
 		public static final EClass SQL_RESULT_SET_MAPPING = eINSTANCE.getSqlResultSetMapping();
@@ -6845,11 +6845,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute SQL_RESULT_SET_MAPPING__DESCRIPTION = eINSTANCE.getSqlResultSetMapping_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.EventMethod <em>Event Method</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.EventMethod <em>Event Method</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.EventMethod
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.EventMethod
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod()
 		 * @generated
 		 */
 		public static final EClass EVENT_METHOD = eINSTANCE.getEventMethod();
@@ -6863,81 +6863,81 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute EVENT_METHOD__DESCRIPTION = eINSTANCE.getEventMethod_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostLoad <em>Post Load</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostLoad <em>Post Load</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PostLoad
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostLoad()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostLoad
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostLoad()
 		 * @generated
 		 */
 		public static final EClass POST_LOAD = eINSTANCE.getPostLoad();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostPersist <em>Post Persist</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostPersist <em>Post Persist</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PostPersist
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostPersist()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostPersist
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostPersist()
 		 * @generated
 		 */
 		public static final EClass POST_PERSIST = eINSTANCE.getPostPersist();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostRemove <em>Post Remove</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostRemove <em>Post Remove</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PostRemove
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostRemove()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostRemove
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostRemove()
 		 * @generated
 		 */
 		public static final EClass POST_REMOVE = eINSTANCE.getPostRemove();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PostUpdate <em>Post Update</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate <em>Post Update</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PostUpdate
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostUpdate()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostUpdate()
 		 * @generated
 		 */
 		public static final EClass POST_UPDATE = eINSTANCE.getPostUpdate();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PrePersist <em>Pre Persist</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PrePersist <em>Pre Persist</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PrePersist
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPrePersist()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PrePersist
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPrePersist()
 		 * @generated
 		 */
 		public static final EClass PRE_PERSIST = eINSTANCE.getPrePersist();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PreRemove <em>Pre Remove</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreRemove <em>Pre Remove</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PreRemove
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreRemove()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreRemove
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreRemove()
 		 * @generated
 		 */
 		public static final EClass PRE_REMOVE = eINSTANCE.getPreRemove();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.PreUpdate <em>Pre Update</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate <em>Pre Update</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.PreUpdate
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreUpdate()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreUpdate()
 		 * @generated
 		 */
 		public static final EClass PRE_UPDATE = eINSTANCE.getPreUpdate();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint <em>Xml Query Hint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQueryHint()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQueryHint()
 		 * @generated
 		 */
 		public static final EClass XML_QUERY_HINT = eINSTANCE.getXmlQueryHint();
@@ -6951,11 +6951,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_QUERY_HINT__DESCRIPTION = eINSTANCE.getXmlQueryHint_Description();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable <em>Xml Collection Table</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlCollectionTable()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlCollectionTable()
 		 * @generated
 		 */
 		public static final EClass XML_COLLECTION_TABLE = eINSTANCE.getXmlCollectionTable();
@@ -6969,11 +6969,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EReference XML_COLLECTION_TABLE__JOIN_COLUMNS = eINSTANCE.getXmlCollectionTable_JoinColumns();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn <em>Xml Order Column</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn()
 		 * @generated
 		 */
 		public static final EClass XML_ORDER_COLUMN = eINSTANCE.getXmlOrderColumn();
@@ -7011,31 +7011,31 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_ORDER_COLUMN__TABLE = eINSTANCE.getXmlOrderColumn_Table();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn <em>Xml Map Key Column</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyColumn
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyColumn
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
 		 * @generated
 		 */
 		public static final EClass XML_MAP_KEY_COLUMN = eINSTANCE.getXmlMapKeyColumn();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn <em>Xml Map Key Join Column</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
 		 * @generated
 		 */
 		public static final EClass XML_MAP_KEY_JOIN_COLUMN = eINSTANCE.getXmlMapKeyJoinColumn();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass <em>Xml Map Key Class</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyClass()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyClass()
 		 * @generated
 		 */
 		public static final EClass XML_MAP_KEY_CLASS = eINSTANCE.getXmlMapKeyClass();
@@ -7049,11 +7049,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_MAP_KEY_CLASS__CLASS_NAME = eINSTANCE.getXmlMapKeyClass_ClassName();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint <em>Xml Unique Constraint</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
 		 * @generated
 		 */
 		public static final EClass XML_UNIQUE_CONSTRAINT = eINSTANCE.getXmlUniqueConstraint();
@@ -7067,11 +7067,11 @@ public class Orm2_0Package extends EPackageImpl
 		public static final EAttribute XML_UNIQUE_CONSTRAINT__NAME = eINSTANCE.getXmlUniqueConstraint_Name();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.orm.LockModeType <em>Lock Mode Type</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.orm.LockModeType <em>Lock Mode Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.orm.LockModeType
-		 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getLockModeType()
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.LockModeType
+		 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getLockModeType()
 		 * @generated
 		 */
 		public static final EEnum LOCK_MODE_TYPE = eINSTANCE.getLockModeType();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0XmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0XmlResourceFactory.java
index dff3d26bcb..4e523b90b8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/Orm2_0XmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/Orm2_0XmlResourceFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostLoad.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostLoad.java
index c47b741fac..ddc071ef61 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostLoad.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostLoad.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostLoad()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostLoad()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PostLoad extends org.eclipse.jpt.core.resource.orm.PostLoad impleme
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PostLoad extends org.eclipse.jpt.core.resource.orm.PostLoad impleme
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PostLoad#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostLoad#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostPersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostPersist.java
index b825a8dc78..4e8691335d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostPersist.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostPersist.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostPersist()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostPersist()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PostPersist extends org.eclipse.jpt.core.resource.orm.PostPersist i
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PostPersist extends org.eclipse.jpt.core.resource.orm.PostPersist i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PostPersist#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostPersist#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostRemove.java
index bbba42d38f..bdaaafb6f4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostRemove.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostRemove.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostRemove()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostRemove()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PostRemove extends org.eclipse.jpt.core.resource.orm.PostRemove imp
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PostRemove extends org.eclipse.jpt.core.resource.orm.PostRemove imp
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PostRemove#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostRemove#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostUpdate.java
index 18aa64e378..5770e54599 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PostUpdate.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PostUpdate.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPostUpdate()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPostUpdate()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PostUpdate extends org.eclipse.jpt.core.resource.orm.PostUpdate imp
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PostUpdate extends org.eclipse.jpt.core.resource.orm.PostUpdate imp
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PostUpdate#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PostUpdate#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PrePersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PrePersist.java
index f529fc2b9c..bd9f6a0a80 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PrePersist.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PrePersist.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPrePersist()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPrePersist()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PrePersist extends org.eclipse.jpt.core.resource.orm.PrePersist imp
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PrePersist extends org.eclipse.jpt.core.resource.orm.PrePersist imp
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PrePersist#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PrePersist#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PreRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PreRemove.java
index 32a99e4969..6eddeddd3c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PreRemove.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PreRemove.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreRemove()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreRemove()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PreRemove extends org.eclipse.jpt.core.resource.orm.PreRemove imple
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PreRemove extends org.eclipse.jpt.core.resource.orm.PreRemove imple
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PreRemove#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreRemove#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PreUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PreUpdate.java
index 7fc5384995..411d073428 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/PreUpdate.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/PreUpdate.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getPreUpdate()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getPreUpdate()
  * @model kind="class"
  * @generated
  */
@@ -80,7 +80,7 @@ public class PreUpdate extends org.eclipse.jpt.core.resource.orm.PreUpdate imple
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getEventMethod_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getEventMethod_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -90,7 +90,7 @@ public class PreUpdate extends org.eclipse.jpt.core.resource.orm.PreUpdate imple
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.PreUpdate#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.PreUpdate#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/SqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/SqlResultSetMapping.java
index b8145d7195..f021371d25 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/SqlResultSetMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/SqlResultSetMapping.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -26,11 +26,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getSqlResultSetMapping()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getSqlResultSetMapping()
  * @model kind="class"
  * @generated
  */
@@ -87,7 +87,7 @@ public class SqlResultSetMapping extends org.eclipse.jpt.core.resource.orm.SqlRe
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getSqlResultSetMapping_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getSqlResultSetMapping_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -97,7 +97,7 @@ public class SqlResultSetMapping extends org.eclipse.jpt.core.resource.orm.SqlRe
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.SqlResultSetMapping#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAssociationOverride.java
index 70836449be..9d2b69a02e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAssociationOverride.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -30,12 +30,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAssociationOverride()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAssociationOverride()
  * @model kind="class"
  * @generated
  */
@@ -102,7 +102,7 @@ public class XmlAssociationOverride extends org.eclipse.jpt.core.resource.orm.Xm
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAssociationOverride_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAssociationOverride_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -112,7 +112,7 @@ public class XmlAssociationOverride extends org.eclipse.jpt.core.resource.orm.Xm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -137,7 +137,7 @@ public class XmlAssociationOverride extends org.eclipse.jpt.core.resource.orm.Xm
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Join Table</em>' containment reference.
 	 * @see #setJoinTable(XmlJoinTable)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAssociationOverride_JoinTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAssociationOverride_JoinTable()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -164,7 +164,7 @@ public class XmlAssociationOverride extends org.eclipse.jpt.core.resource.orm.Xm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride#getJoinTable <em>Join Table</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Join Table</em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAttributeMapping.java
index 5a955d32e4..568a076b72 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAttributeMapping.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.jpt.core.resource.orm.XmlAccessHolder;
 
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.resource.orm.XmlAccessHolder;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeMapping()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeMapping()
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAttributeOverride.java
index f681a3cb87..719a01e087 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlAttributeOverride.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -26,11 +26,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeOverride()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeOverride()
  * @model kind="class"
  * @generated
  */
@@ -87,7 +87,7 @@ public class XmlAttributeOverride extends org.eclipse.jpt.core.resource.orm.XmlA
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAttributeOverride_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAttributeOverride_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -97,7 +97,7 @@ public class XmlAttributeOverride extends org.eclipse.jpt.core.resource.orm.XmlA
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlBasic.java
index 9257bc9829..f849ffad10 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlBasic.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlBasic()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlBasic()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlBasic extends org.eclipse.jpt.core.resource.orm.XmlBasic impleme
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlBasic#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlBasic#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlCollectionTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlCollectionTable.java
index 3d48649b99..61546d2d7e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlCollectionTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlCollectionTable.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -36,11 +36,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlCollectionTable#getJoinColumns <em>Join Columns</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlCollectionTable#getJoinColumns <em>Join Columns</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlCollectionTable()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlCollectionTable()
  * @model kind="class"
  * @generated
  */
@@ -87,7 +87,7 @@ public class XmlCollectionTable extends AbstractXmlTable
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlCollectionTable_JoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlCollectionTable_JoinColumns()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlElementCollection.java
index fba1bf632a..4767027247 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlElementCollection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.jpt.core.internal.resource.xml.translators.BooleanTranslator;
 import org.eclipse.jpt.core.internal.resource.xml.translators.EmptyTagBooleanTranslator;
 import org.eclipse.jpt.core.internal.resource.xml.translators.SimpleTranslator;
+import org.eclipse.jpt.core.jpa2.MappingKeys2_0;
 import org.eclipse.jpt.core.resource.orm.AbstractXmlAttributeMapping;
 import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.resource.orm.EnumType;
@@ -40,7 +41,6 @@ import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride;
 import org.eclipse.jpt.core.resource.orm.XmlColumn;
 import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
-import org.eclipse.jpt2_0.core.MappingKeys2_0;
 import org.eclipse.wst.common.internal.emf.resource.Translator;
 
 /**
@@ -51,28 +51,28 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getColumn <em>Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#isLob <em>Lob</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAttributeOverrides <em>Attribute Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAssociationOverrides <em>Association Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getColumn <em>Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#isLob <em>Lob</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAttributeOverrides <em>Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAssociationOverrides <em>Association Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection()
  * @model kind="class"
  * @generated
  */
@@ -367,7 +367,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -377,7 +377,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -403,7 +403,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Target Class</em>' attribute.
 	 * @see #setTargetClass(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_TargetClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_TargetClass()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -413,7 +413,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTargetClass <em>Target Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Target Class</em>' attribute.
@@ -440,7 +440,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Fetch</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.FetchType
 	 * @see #setFetch(FetchType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_Fetch()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_Fetch()
 	 * @model
 	 * @generated
 	 */
@@ -450,7 +450,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getFetch <em>Fetch</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Fetch</em>' attribute.
@@ -476,7 +476,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Order By</em>' attribute.
 	 * @see #setOrderBy(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_OrderBy()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_OrderBy()
 	 * @model dataType="org.eclipse.jpt.core.resource.orm.OrderBy"
 	 * @generated
 	 */
@@ -486,7 +486,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderBy <em>Order By</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Order By</em>' attribute.
@@ -511,7 +511,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Order Column</em>' containment reference.
 	 * @see #setOrderColumn(XmlOrderColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_OrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_OrderColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -538,7 +538,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getOrderColumn <em>Order Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Order Column</em>' containment reference.
@@ -571,7 +571,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key</em>' containment reference.
 	 * @see #setMapKey(MapKey)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKey()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKey()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -598,7 +598,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKey <em>Map Key</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key</em>' containment reference.
@@ -631,7 +631,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Class</em>' containment reference.
 	 * @see #setMapKeyClass(XmlMapKeyClass)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyClass()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -658,7 +658,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyClass <em>Map Key Class</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Class</em>' containment reference.
@@ -693,7 +693,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Map Key Temporal</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
 	 * @see #setMapKeyTemporal(TemporalType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyTemporal()
 	 * @model
 	 * @generated
 	 */
@@ -703,7 +703,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Temporal</em>' attribute.
@@ -731,7 +731,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Map Key Enumerated</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.EnumType
 	 * @see #setMapKeyEnumerated(EnumType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyEnumerated()
 	 * @model
 	 * @generated
 	 */
@@ -741,7 +741,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Enumerated</em>' attribute.
@@ -767,7 +767,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyAttributeOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -790,7 +790,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Column</em>' containment reference.
 	 * @see #setMapKeyColumn(XmlMapKeyColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -817,7 +817,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Column</em>' containment reference.
@@ -842,7 +842,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 
 	/**
 	 * Returns the value of the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn}.
+	 * The list contents are of type {@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Map Key Join Columns</em>' containment reference list isn't clear,
@@ -850,7 +850,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_MapKeyJoinColumns()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -873,7 +873,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Column</em>' containment reference.
 	 * @see #setColumn(XmlColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_Column()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_Column()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -900,7 +900,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getColumn <em>Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getColumn <em>Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Column</em>' containment reference.
@@ -935,7 +935,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Temporal</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
 	 * @see #setTemporal(TemporalType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_Temporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_Temporal()
 	 * @model
 	 * @generated
 	 */
@@ -945,7 +945,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getTemporal <em>Temporal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Temporal</em>' attribute.
@@ -973,7 +973,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * @return the value of the '<em>Enumerated</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.EnumType
 	 * @see #setEnumerated(EnumType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_Enumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_Enumerated()
 	 * @model
 	 * @generated
 	 */
@@ -983,7 +983,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getEnumerated <em>Enumerated</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Enumerated</em>' attribute.
@@ -1009,7 +1009,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Lob</em>' attribute.
 	 * @see #setLob(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_Lob()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_Lob()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -1019,7 +1019,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#isLob <em>Lob</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#isLob <em>Lob</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Lob</em>' attribute.
@@ -1044,7 +1044,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_AttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_AttributeOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -1067,7 +1067,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_AssociationOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_AssociationOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -1090,7 +1090,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Collection Table</em>' containment reference.
 	 * @see #setCollectionTable(XmlCollectionTable)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlElementCollection_CollectionTable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlElementCollection_CollectionTable()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -1117,7 +1117,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlElementCollection#getCollectionTable <em>Collection Table</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Collection Table</em>' containment reference.
@@ -1530,15 +1530,15 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
 			XmlMapKeyClass.buildTranslator(JPA.MAP_KEY_CLASS, Orm2_0Package.eINSTANCE.getXmlElementCollection_MapKeyClass()),		
 			buildMapKeyTemporalTranslator(),
 			buildMapKeyEnumeratedTranslator(),
-			org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_MapKeyAttributeOverrides()),		
+			org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_MapKeyAttributeOverrides()),		
 			XmlColumn.buildTranslator(JPA.MAP_KEY_COLUMN, Orm2_0Package.eINSTANCE.getXmlElementCollection_MapKeyColumn()),		
 			XmlJoinColumn.buildTranslator(JPA.MAP_KEY_JOIN_COLUMN, Orm2_0Package.eINSTANCE.getXmlElementCollection_MapKeyJoinColumns()),		
 			XmlColumn.buildTranslator(JPA.COLUMN, Orm2_0Package.eINSTANCE.getXmlElementCollection_Column()),		
 			buildTemporalTranslator(),
 			buildEnumeratedTranslator(),
 			buildLobTranslator(),
-			org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride.buildTranslator(JPA.ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_AttributeOverrides()),		
-			org.eclipse.jpt2_0.core.resource.orm.XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_AssociationOverrides()),		
+			org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride.buildTranslator(JPA.ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_AttributeOverrides()),		
+			org.eclipse.jpt.core.jpa2.resource.orm.XmlAssociationOverride.buildTranslator(JPA.ASSOCIATION_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlElementCollection_AssociationOverrides()),		
 			XmlCollectionTable.buildTranslator(JPA.COLLECTION_TABLE, Orm2_0Package.eINSTANCE.getXmlElementCollection_CollectionTable())			
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbeddable.java
index eb90cc5a3d..ee4d166def 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbeddable.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -20,7 +20,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddable()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddable()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbedded.java
index c510524b64..1013c711e9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbedded.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -40,11 +40,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded#getAssociationOverrides <em>Association Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded#getAssociationOverrides <em>Association Overrides</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbedded()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbedded()
  * @model kind="class"
  * @generated
  */
@@ -109,7 +109,7 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -119,7 +119,7 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbedded#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbedded#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -145,7 +145,7 @@ public class XmlEmbedded extends org.eclipse.jpt.core.resource.orm.XmlEmbedded i
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Association Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbedded_AssociationOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbedded_AssociationOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbeddedId.java
index 70ae03e6d0..6473161ea8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEmbeddedId.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEmbeddedId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEmbeddedId()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEmbeddedId()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlEmbeddedId extends org.eclipse.jpt.core.resource.orm.XmlEmbedded
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEmbeddedId#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEmbeddedId#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEntity.java
index ccd1345722..5fa7f1988c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEntity.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -24,11 +24,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntity()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntity()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Cacheable</em>' attribute.
 	 * @see #setCacheable(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntity_Cacheable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntity_Cacheable()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlEntity extends org.eclipse.jpt.core.resource.orm.XmlEntity
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlEntity#isCacheable <em>Cacheable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Cacheable</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEntityMappings.java
index 9dde20f08a..3ee6891ae3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlEntityMappings.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.jpt.core.internal.resource.xml.translators.SimpleRootTranslator;
@@ -22,7 +22,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlEntityMappings()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlEntityMappings()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlGenerator.java
index 2658e6af13..ad0c0312bc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlGenerator.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 
 /**
@@ -18,11 +18,11 @@ package org.eclipse.jpt2_0.core.resource.orm;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator()
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
@@ -38,14 +38,14 @@ public interface XmlGenerator extends org.eclipse.jpt.core.resource.orm.XmlGener
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlGenerator#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlGenerator#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlId.java
index 1aa796f946..870e435727 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlId()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlId()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlId extends org.eclipse.jpt.core.resource.orm.XmlId implements Xm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlId#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlId#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlManyToMany.java
index b934f4f539..58fffe5b23 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlManyToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -44,17 +44,17 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany()
  * @model kind="class"
  * @generated
  */
@@ -191,7 +191,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -201,7 +201,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -227,7 +227,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Order Column</em>' containment reference.
 	 * @see #setOrderColumn(XmlOrderColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_OrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_OrderColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -254,7 +254,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getOrderColumn <em>Order Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Order Column</em>' containment reference.
@@ -287,7 +287,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Class</em>' containment reference.
 	 * @see #setMapKeyClass(XmlMapKeyClass)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyClass()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -314,7 +314,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyClass <em>Map Key Class</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Class</em>' containment reference.
@@ -349,7 +349,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * @return the value of the '<em>Map Key Temporal</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
 	 * @see #setMapKeyTemporal(TemporalType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyTemporal()
 	 * @model
 	 * @generated
 	 */
@@ -359,7 +359,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Temporal</em>' attribute.
@@ -387,7 +387,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * @return the value of the '<em>Map Key Enumerated</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.EnumType
 	 * @see #setMapKeyEnumerated(EnumType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyEnumerated()
 	 * @model
 	 * @generated
 	 */
@@ -397,7 +397,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Enumerated</em>' attribute.
@@ -423,7 +423,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyAttributeOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -446,7 +446,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Column</em>' containment reference.
 	 * @see #setMapKeyColumn(XmlMapKeyColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -473,7 +473,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToMany#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Column</em>' containment reference.
@@ -498,7 +498,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 
 	/**
 	 * Returns the value of the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn}.
+	 * The list contents are of type {@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Map Key Join Columns</em>' containment reference list isn't clear,
@@ -506,7 +506,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToMany_MapKeyJoinColumns()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -778,7 +778,7 @@ public class XmlManyToMany extends org.eclipse.jpt.core.resource.orm.XmlManyToMa
 			XmlMapKeyClass.buildTranslator(JPA.MAP_KEY_CLASS, Orm2_0Package.eINSTANCE.getXmlManyToMany_MapKeyClass()),		
 			buildMapKeyTemporalTranslator(),
 			buildMapKeyEnumeratedTranslator(),
-			org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlManyToMany_MapKeyAttributeOverrides()),		
+			org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlManyToMany_MapKeyAttributeOverrides()),		
 			XmlColumn.buildTranslator(JPA.MAP_KEY_COLUMN, Orm2_0Package.eINSTANCE.getXmlManyToMany_MapKeyColumn()),		
 			XmlJoinColumn.buildTranslator(JPA.MAP_KEY_JOIN_COLUMN, Orm2_0Package.eINSTANCE.getXmlManyToMany_MapKeyJoinColumns()),		
 			buildJoinTableTranslator(),
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlManyToOne.java
index 68a4c9aa68..b41fe4917c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlManyToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,12 +30,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#isId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#isId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToOne()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToOne()
  * @model kind="class"
  * @generated
  */
@@ -130,7 +130,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -140,7 +140,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -166,7 +166,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Mapped By Id</em>' attribute.
 	 * @see #setMappedById(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToOne_MappedById()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToOne_MappedById()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -176,7 +176,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#getMappedById <em>Mapped By Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Mapped By Id</em>' attribute.
@@ -201,7 +201,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlManyToOne_Id()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlManyToOne_Id()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -211,7 +211,7 @@ public class XmlManyToOne extends org.eclipse.jpt.core.resource.orm.XmlManyToOne
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlManyToOne#isId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlManyToOne#isId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyClass.java
index 77413aece5..0e897bb8e1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyClass.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyClass.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,11 +30,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyClass()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyClass()
  * @model kind="class"
  * @extends JpaEObject
  * @generated
@@ -92,7 +92,7 @@ public class XmlMapKeyClass extends AbstractJpaEObject implements JpaEObject
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Class Name</em>' attribute.
 	 * @see #setClassName(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyClass_ClassName()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyClass_ClassName()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
 	 * @generated
 	 */
@@ -102,7 +102,7 @@ public class XmlMapKeyClass extends AbstractJpaEObject implements JpaEObject
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyClass#getClassName <em>Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Class Name</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyColumn.java
index 0cc55641f1..677c251c3c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyColumn.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.resource.orm.XmlColumn;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyColumn()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyJoinColumn.java
index cb633704fe..cb33b77618 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMapKeyJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMapKeyJoinColumn.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.resource.orm.XmlJoinColumn;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMapKeyJoinColumn()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMappedSuperclass.java
index 0a4c155551..2722b174c3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlMappedSuperclass.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -20,7 +20,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlMappedSuperclass()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlNamedNativeQuery.java
index f8706a2800..f9e2bd7649 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlNamedNativeQuery.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -24,7 +24,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedNativeQuery()
  * @model kind="class"
  * @generated
  */
@@ -81,7 +81,7 @@ public class XmlNamedNativeQuery extends org.eclipse.jpt.core.resource.orm.XmlNa
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -91,7 +91,7 @@ public class XmlNamedNativeQuery extends org.eclipse.jpt.core.resource.orm.XmlNa
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedNativeQuery#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedNativeQuery#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlNamedQuery.java
index 1f3ab63f23..5e846c4c44 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlNamedQuery.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -27,11 +27,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedQuery()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedQuery()
  * @model kind="class"
  * @generated
  */
@@ -108,7 +108,7 @@ public class XmlNamedQuery extends org.eclipse.jpt.core.resource.orm.XmlNamedQue
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -118,7 +118,7 @@ public class XmlNamedQuery extends org.eclipse.jpt.core.resource.orm.XmlNamedQue
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -135,7 +135,7 @@ public class XmlNamedQuery extends org.eclipse.jpt.core.resource.orm.XmlNamedQue
 
 	/**
 	 * Returns the value of the '<em><b>Lock Mode</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.jpt2_0.core.resource.orm.LockModeType}.
+	 * The literals are from the enumeration {@link org.eclipse.jpt.core.jpa2.resource.orm.LockModeType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Lock Mode</em>' attribute isn't clear,
@@ -143,9 +143,9 @@ public class XmlNamedQuery extends org.eclipse.jpt.core.resource.orm.XmlNamedQue
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Lock Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.LockModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.LockModeType
 	 * @see #setLockMode(LockModeType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlNamedQuery_LockMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlNamedQuery_LockMode()
 	 * @model
 	 * @generated
 	 */
@@ -155,11 +155,11 @@ public class XmlNamedQuery extends org.eclipse.jpt.core.resource.orm.XmlNamedQue
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlNamedQuery#getLockMode <em>Lock Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Lock Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.LockModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.LockModeType
 	 * @see #getLockMode()
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOneToMany.java
index d9c4b88b19..29f6ee7164 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOneToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import java.util.Collection;
 
@@ -44,18 +44,18 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyAttributeOverrides <em>Map Key Attribute Overrides</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyJoinColumns <em>Map Key Join Columns</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany()
  * @model kind="class"
  * @generated
  */
@@ -212,7 +212,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -222,7 +222,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -248,7 +248,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Order Column</em>' containment reference.
 	 * @see #setOrderColumn(XmlOrderColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_OrderColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_OrderColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -275,7 +275,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getOrderColumn <em>Order Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Order Column</em>' containment reference.
@@ -308,7 +308,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Class</em>' containment reference.
 	 * @see #setMapKeyClass(XmlMapKeyClass)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyClass()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyClass()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -335,7 +335,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyClass <em>Map Key Class</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Class</em>' containment reference.
@@ -370,7 +370,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * @return the value of the '<em>Map Key Temporal</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.TemporalType
 	 * @see #setMapKeyTemporal(TemporalType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyTemporal()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyTemporal()
 	 * @model
 	 * @generated
 	 */
@@ -380,7 +380,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyTemporal <em>Map Key Temporal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Temporal</em>' attribute.
@@ -408,7 +408,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * @return the value of the '<em>Map Key Enumerated</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.EnumType
 	 * @see #setMapKeyEnumerated(EnumType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyEnumerated()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyEnumerated()
 	 * @model
 	 * @generated
 	 */
@@ -418,7 +418,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyEnumerated <em>Map Key Enumerated</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Enumerated</em>' attribute.
@@ -444,7 +444,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Attribute Overrides</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyAttributeOverrides()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyAttributeOverrides()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -467,7 +467,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Column</em>' containment reference.
 	 * @see #setMapKeyColumn(XmlMapKeyColumn)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyColumn()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyColumn()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -494,7 +494,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#getMapKeyColumn <em>Map Key Column</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Map Key Column</em>' containment reference.
@@ -519,7 +519,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 
 	/**
 	 * Returns the value of the '<em><b>Map Key Join Columns</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.jpt2_0.core.resource.orm.XmlMapKeyJoinColumn}.
+	 * The list contents are of type {@link org.eclipse.jpt.core.jpa2.resource.orm.XmlMapKeyJoinColumn}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Map Key Join Columns</em>' containment reference list isn't clear,
@@ -527,7 +527,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Map Key Join Columns</em>' containment reference list.
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyJoinColumns()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_MapKeyJoinColumns()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -550,7 +550,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Orphan Removal</em>' attribute.
 	 * @see #setOrphanRemoval(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToMany_OrphanRemoval()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToMany_OrphanRemoval()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -560,7 +560,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToMany#isOrphanRemoval <em>Orphan Removal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Orphan Removal</em>' attribute.
@@ -847,7 +847,7 @@ public class XmlOneToMany extends org.eclipse.jpt.core.resource.orm.XmlOneToMany
 			XmlMapKeyClass.buildTranslator(JPA.MAP_KEY_CLASS, Orm2_0Package.eINSTANCE.getXmlOneToMany_MapKeyClass()),		
 			buildMapKeyTemporalTranslator(),
 			buildMapKeyEnumeratedTranslator(),
-			org.eclipse.jpt2_0.core.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlOneToMany_MapKeyAttributeOverrides()),		
+			org.eclipse.jpt.core.jpa2.resource.orm.XmlAttributeOverride.buildTranslator(JPA.MAP_KEY_ATTRIBUTE_OVERRIDE, Orm2_0Package.eINSTANCE.getXmlOneToMany_MapKeyAttributeOverrides()),		
 			XmlColumn.buildTranslator(JPA.MAP_KEY_COLUMN, Orm2_0Package.eINSTANCE.getXmlOneToMany_MapKeyColumn()),		
 			XmlJoinColumn.buildTranslator(JPA.MAP_KEY_JOIN_COLUMN, Orm2_0Package.eINSTANCE.getXmlOneToMany_MapKeyJoinColumns()),		
 			buildJoinTableTranslator(),
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOneToOne.java
index 3d1ea52aeb..22bc1bb4e1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOneToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -30,13 +30,13 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne()
  * @model kind="class"
  * @generated
  */
@@ -151,7 +151,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -161,7 +161,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -187,7 +187,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Orphan Removal</em>' attribute.
 	 * @see #setOrphanRemoval(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne_OrphanRemoval()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne_OrphanRemoval()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -197,7 +197,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isOrphanRemoval <em>Orphan Removal</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Orphan Removal</em>' attribute.
@@ -222,7 +222,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Mapped By Id</em>' attribute.
 	 * @see #setMappedById(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne_MappedById()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne_MappedById()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -232,7 +232,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#getMappedById <em>Mapped By Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Mapped By Id</em>' attribute.
@@ -257,7 +257,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOneToOne_Id()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOneToOne_Id()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -267,7 +267,7 @@ public class XmlOneToOne extends org.eclipse.jpt.core.resource.orm.XmlOneToOne i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOneToOne#isId <em>Id</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOneToOne#isId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Id</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOrderColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOrderColumn.java
index 018f0f1add..e1a5d4a868 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlOrderColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlOrderColumn.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -29,14 +29,14 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getTable <em>Table</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getTable <em>Table</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn()
  * @model kind="class"
  * @generated
  */
@@ -153,7 +153,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Insertable</em>' attribute.
 	 * @see #setInsertable(Boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn_Insertable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn_Insertable()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
 	 * @generated
 	 */
@@ -163,7 +163,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getInsertable <em>Insertable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Insertable</em>' attribute.
@@ -188,7 +188,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nullable</em>' attribute.
 	 * @see #setNullable(Boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn_Nullable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn_Nullable()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
 	 * @generated
 	 */
@@ -198,7 +198,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getNullable <em>Nullable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Nullable</em>' attribute.
@@ -223,7 +223,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Updatable</em>' attribute.
 	 * @see #setUpdatable(Boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn_Updatable()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn_Updatable()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
 	 * @generated
 	 */
@@ -233,7 +233,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getUpdatable <em>Updatable</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Updatable</em>' attribute.
@@ -258,7 +258,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Table</em>' attribute.
 	 * @see #setTable(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlOrderColumn_Table()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlOrderColumn_Table()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -268,7 +268,7 @@ public class XmlOrderColumn extends AbstractXmlNamedColumn
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlOrderColumn#getTable <em>Table</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlOrderColumn#getTable <em>Table</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Table</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlPersistenceUnitDefaults.java
index 5377980353..1190ff1adc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlPersistenceUnitDefaults.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,12 +28,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults()
  * @model kind="class"
  * @generated
  */
@@ -110,7 +110,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.core.resource.or
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -120,7 +120,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.core.resource.or
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -145,7 +145,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.core.resource.or
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Delimited Identifiers</em>' attribute.
 	 * @see #setDelimitedIdentifiers(boolean)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults_DelimitedIdentifiers()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitDefaults_DelimitedIdentifiers()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean"
 	 * @generated
 	 */
@@ -155,7 +155,7 @@ public class XmlPersistenceUnitDefaults extends org.eclipse.jpt.core.resource.or
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitDefaults#isDelimitedIdentifiers <em>Delimited Identifiers</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Delimited Identifiers</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlPersistenceUnitMetadata.java
index 8d8fc9890f..bdde650624 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlPersistenceUnitMetadata.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -27,11 +27,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata()
  * @model kind="class"
  * @generated
  */
@@ -88,7 +88,7 @@ public class XmlPersistenceUnitMetadata extends org.eclipse.jpt.core.resource.or
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlPersistenceUnitMetadata_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -98,7 +98,7 @@ public class XmlPersistenceUnitMetadata extends org.eclipse.jpt.core.resource.or
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlPersistenceUnitMetadata#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlQuery.java
index c620842f92..f2a5930111 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlQuery.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 
 /**
@@ -18,11 +18,11 @@ package org.eclipse.jpt2_0.core.resource.orm;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery()
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
@@ -38,14 +38,14 @@ public interface XmlQuery extends org.eclipse.jpt.core.resource.orm.XmlQuery
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQuery_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQuery_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQuery#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQuery#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlQueryHint.java
index 8f2ced8056..c85e9ac6ed 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlQueryHint.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -26,11 +26,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint#getDescription <em>Description</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint#getDescription <em>Description</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQueryHint()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQueryHint()
  * @model kind="class"
  * @generated
  */
@@ -88,7 +88,7 @@ public class XmlQueryHint extends org.eclipse.jpt.core.resource.orm.XmlQueryHint
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlQueryHint_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlQueryHint_Description()
 	 * @model default="" dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -98,7 +98,7 @@ public class XmlQueryHint extends org.eclipse.jpt.core.resource.orm.XmlQueryHint
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlQueryHint#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlQueryHint#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlSequenceGenerator.java
index 4a8ab30cef..134224a4a7 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlSequenceGenerator.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -26,12 +26,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlSequenceGenerator()
  * @model kind="class"
  * @generated
  */
@@ -128,7 +128,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -138,7 +138,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
@@ -163,7 +163,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Catalog</em>' attribute.
 	 * @see #setCatalog(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlSequenceGenerator_Catalog()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlSequenceGenerator_Catalog()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -173,7 +173,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getCatalog <em>Catalog</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Catalog</em>' attribute.
@@ -198,7 +198,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Schema</em>' attribute.
 	 * @see #setSchema(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlSequenceGenerator_Schema()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlSequenceGenerator_Schema()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -208,7 +208,7 @@ public class XmlSequenceGenerator extends org.eclipse.jpt.core.resource.orm.XmlS
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator#getSchema <em>Schema</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Schema</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlTableGenerator.java
index 8c891666d2..36fa7320ce 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlTableGenerator.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -25,7 +25,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTableGenerator()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTableGenerator()
  * @model kind="class"
  * @generated
  */
@@ -82,7 +82,7 @@ public class XmlTableGenerator extends org.eclipse.jpt.core.resource.orm.XmlTabl
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Description</em>' attribute.
 	 * @see #setDescription(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlGenerator_Description()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlGenerator_Description()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -92,7 +92,7 @@ public class XmlTableGenerator extends org.eclipse.jpt.core.resource.orm.XmlTabl
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTableGenerator#getDescription <em>Description</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTableGenerator#getDescription <em>Description</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Description</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlTransient.java
index e4d36fc720..16e299ef53 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlTransient.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlTransient.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
@@ -26,7 +26,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlTransient()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlTransient()
  * @model kind="class"
  * @generated
  */
@@ -81,7 +81,7 @@ public class XmlTransient extends org.eclipse.jpt.core.resource.orm.XmlTransient
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -91,7 +91,7 @@ public class XmlTransient extends org.eclipse.jpt.core.resource.orm.XmlTransient
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlTransient#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlTransient#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlUniqueConstraint.java
index 8dd5537f47..57e463ddac 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlUniqueConstraint.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -26,11 +26,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlUniqueConstraint()
  * @model kind="class"
  * @generated
  */
@@ -87,7 +87,7 @@ public class XmlUniqueConstraint extends org.eclipse.jpt.core.resource.orm.XmlUn
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlUniqueConstraint_Name()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlUniqueConstraint_Name()
 	 * @model dataType="org.eclipse.emf.ecore.xml.type.String"
 	 * @generated
 	 */
@@ -97,7 +97,7 @@ public class XmlUniqueConstraint extends org.eclipse.jpt.core.resource.orm.XmlUn
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlUniqueConstraint#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Name</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlVersion.java
index d0d7ae0913..efc205f51d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/orm/XmlVersion.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.orm;
+package org.eclipse.jpt.core.jpa2.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlVersion()
+ * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlVersion()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlVersion extends org.eclipse.jpt.core.resource.orm.XmlVersion imp
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.orm.XmlVersion#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.orm.XmlVersion#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/JPA.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/JPA.java
index 0216bb9f6e..1fe553bc34 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/JPA.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/JPA.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 /**
  * JPA persistence2_0.xml-related stuff (elements, attributes etc.)
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0Factory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0Factory.java
index 6771fbfb0b..99284da204 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0Factory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0Factory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package
  * @generated
  */
 public class Persistence2_0Factory extends EFactoryImpl
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0Package.java
index 64589dd678..03123a3c4f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0Package.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EcorePackage;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package;
 import org.eclipse.jpt.core.resource.orm.OrmPackage;
 import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,7 +32,7 @@ import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Factory
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Factory
  * @model kind="package"
  * @generated
  */
@@ -68,14 +68,14 @@ public class Persistence2_0Package extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final Persistence2_0Package eINSTANCE = org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package.init();
+	public static final Persistence2_0Package eINSTANCE = org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistence()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistence()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE = 0;
@@ -108,11 +108,11 @@ public class Persistence2_0Package extends EPackageImpl
 	public static final int XML_PERSISTENCE_FEATURE_COUNT = PersistencePackage.XML_PERSISTENCE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE_UNIT = 1;
@@ -244,21 +244,21 @@ public class Persistence2_0Package extends EPackageImpl
 	public static final int XML_PERSISTENCE_UNIT_FEATURE_COUNT = PersistencePackage.XML_PERSISTENCE_UNIT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE_UNIT_CACHING_TYPE = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
 	 * @generated
 	 */
 	public static final int XML_PERSISTENCE_UNIT_VALIDATION_MODE_TYPE = 3;
@@ -302,7 +302,7 @@ public class Persistence2_0Package extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#eNS_URI
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -370,11 +370,11 @@ public class Persistence2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Persistence</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence
 	 * @generated
 	 */
 	public EClass getXmlPersistence()
@@ -384,11 +384,11 @@ public class Persistence2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Persistence Unit</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit
 	 * @generated
 	 */
 	public EClass getXmlPersistenceUnit()
@@ -397,11 +397,11 @@ public class Persistence2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Shared Cache Mode</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getSharedCacheMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getSharedCacheMode()
 	 * @see #getXmlPersistenceUnit()
 	 * @generated
 	 */
@@ -412,11 +412,11 @@ public class Persistence2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Validation Mode</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getValidationMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getValidationMode()
 	 * @see #getXmlPersistenceUnit()
 	 * @generated
 	 */
@@ -426,11 +426,11 @@ public class Persistence2_0Package extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Xml Persistence Unit Caching Type</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType
 	 * @generated
 	 */
 	public EEnum getXmlPersistenceUnitCachingType()
@@ -440,11 +440,11 @@ public class Persistence2_0Package extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Xml Persistence Unit Validation Mode Type</em>'.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType
 	 * @generated
 	 */
 	public EEnum getXmlPersistenceUnitValidationModeType()
@@ -570,21 +570,21 @@ public class Persistence2_0Package extends EPackageImpl
 	public interface Literals
 	{
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistence
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistence()
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistence
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistence()
 		 * @generated
 		 */
 		public static final EClass XML_PERSISTENCE = eINSTANCE.getXmlPersistence();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
 		 * @generated
 		 */
 		public static final EClass XML_PERSISTENCE_UNIT = eINSTANCE.getXmlPersistenceUnit();
@@ -606,21 +606,21 @@ public class Persistence2_0Package extends EPackageImpl
 		public static final EAttribute XML_PERSISTENCE_UNIT__VALIDATION_MODE = eINSTANCE.getXmlPersistenceUnit_ValidationMode();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType <em>Xml Persistence Unit Caching Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
 		 * @generated
 		 */
 		public static final EEnum XML_PERSISTENCE_UNIT_CACHING_TYPE = eINSTANCE.getXmlPersistenceUnitCachingType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType <em>Xml Persistence Unit Validation Mode Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType
-		 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType
+		 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
 		 * @generated
 		 */
 		public static final EEnum XML_PERSISTENCE_UNIT_VALIDATION_MODE_TYPE = eINSTANCE.getXmlPersistenceUnitValidationModeType();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0XmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0XmlResourceFactory.java
index 1d749b852f..8db2bcccc8 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/Persistence2_0XmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/Persistence2_0XmlResourceFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistence.java
index f15084a0d3..68723b3e2e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistence.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.jpt.core.internal.resource.xml.translators.SimpleRootTranslator;
@@ -22,7 +22,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistence()
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistence()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnit.java
index 12a119b04e..11c9bccb3d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnit.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -31,12 +31,12 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}</li>
- *   <li>{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}</li>
+ *   <li>{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit()
  * @model kind="class"
  * @generated
  */
@@ -99,7 +99,7 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	/**
 	 * Returns the value of the '<em><b>Shared Cache Mode</b></em>' attribute.
 	 * The default value is <code>"JTA"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType}.
+	 * The literals are from the enumeration {@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Shared Cache Mode</em>' attribute isn't clear,
@@ -107,9 +107,9 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Shared Cache Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType
 	 * @see #setSharedCacheMode(XmlPersistenceUnitCachingType)
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit_SharedCacheMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit_SharedCacheMode()
 	 * @model default="JTA" unique="false"
 	 * @generated
 	 */
@@ -119,11 +119,11 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getSharedCacheMode <em>Shared Cache Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Shared Cache Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitCachingType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitCachingType
 	 * @see #getSharedCacheMode()
 	 * @generated
 	 */
@@ -138,7 +138,7 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	/**
 	 * Returns the value of the '<em><b>Validation Mode</b></em>' attribute.
 	 * The default value is <code>"JTA"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType}.
+	 * The literals are from the enumeration {@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Validation Mode</em>' attribute isn't clear,
@@ -146,9 +146,9 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Validation Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType
 	 * @see #setValidationMode(XmlPersistenceUnitValidationModeType)
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit_ValidationMode()
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnit_ValidationMode()
 	 * @model default="JTA" unique="false"
 	 * @generated
 	 */
@@ -158,11 +158,11 @@ public class XmlPersistenceUnit extends org.eclipse.jpt.core.resource.persistenc
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnit#getValidationMode <em>Validation Mode</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Validation Mode</em>' attribute.
-	 * @see org.eclipse.jpt2_0.core.resource.persistence.XmlPersistenceUnitValidationModeType
+	 * @see org.eclipse.jpt.core.jpa2.resource.persistence.XmlPersistenceUnitValidationModeType
 	 * @see #getValidationMode()
 	 * @generated
 	 */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnitCachingType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnitCachingType.java
index e7891a1cee..bc17df3564 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnitCachingType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnitCachingType.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Xml Persistence Unit Caching Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitCachingType()
  * @model
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnitValidationModeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnitValidationModeType.java
index daadb8d4b5..b7171e5262 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt2_0/core/resource/persistence/XmlPersistenceUnitValidationModeType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/resource/persistence/XmlPersistenceUnitValidationModeType.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.resource.persistence;
+package org.eclipse.jpt.core.jpa2.resource.persistence;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -20,7 +20,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Xml Persistence Unit Validation Mode Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
+ * @see org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package#getXmlPersistenceUnitValidationModeType()
  * @model
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
index 0e047584c8..5945972e6b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java
@@ -19,9 +19,9 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package;
+import org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package;
 import org.eclipse.jpt.core.resource.persistence.PersistencePackage;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package;
-import org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
index 881f01aac1..7c44e36eb6 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java
@@ -9,7 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.resource.persistence;
 
-import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -19,9 +18,9 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Package;
+import org.eclipse.jpt.core.jpa2.resource.persistence.Persistence2_0Package;
 import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt2_0.core.resource.orm.Orm2_0Package;
-import org.eclipse.jpt2_0.core.resource.persistence.Persistence2_0Package;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
index 4f638c1c06..bf5ff4f80d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/META-INF/MANIFEST.MF
@@ -47,12 +47,12 @@ Export-Package: org.eclipse.jpt.eclipselink.core,
  org.eclipse.jpt.eclipselink.core.internal.resource.java.binary;x-internal:=true,
  org.eclipse.jpt.eclipselink.core.internal.resource.java.source;x-internal:=true,
  org.eclipse.jpt.eclipselink.core.internal.resource.orm;x-internal:=true,
+ org.eclipse.jpt.eclipselink.core.internal.v1_1;x-internal:=true,
+ org.eclipse.jpt.eclipselink.core.internal.v1_1.context;x-internal:=true,
+ org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;x-internal:=true,
+ org.eclipse.jpt.eclipselink.core.internal.v1_1.operations;x-internal:=true,
+ org.eclipse.jpt.eclipselink.core.internal.v1_1.resource.orm;x-internal:=true,
  org.eclipse.jpt.eclipselink.core.resource.java,
  org.eclipse.jpt.eclipselink.core.resource.orm,
- org.eclipse.jpt.eclipselink1_1.core.internal;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.core.internal.context;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.core.internal.operations;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.core.resource.orm
+ org.eclipse.jpt.eclipselink.core.v1_1.resource.orm
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLink1_1ResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLink1_1ResourceModels.genmodel
index fe023bf0b4..16f5415002 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLink1_1ResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLink1_1ResourceModels.genmodel
@@ -7,32 +7,32 @@
     editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.core.resource.xml.JpaEObject"
     rootExtendsClass="org.eclipse.jpt.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
     testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jptResourceModels.genmodel#//orm">
-  <foreignModel>eclipselink1_1_orm.ecore</foreignModel>
-  <genPackages prefix="EclipseLink1_1Orm" basePackage="org.eclipse.jpt.eclipselink1_1.core.resource"
-      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink1_1_orm.ecore#/">
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEntityMappings"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEntity"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbeddable"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlMappedSuperclass"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//Attributes"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlAttributeMapping"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlId"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbeddedId"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlEmbedded"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasic">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink1_1_orm.ecore#//XmlBasic/generatedValue"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlVersion"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToOne"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlOneToMany"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToOne"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlManyToMany"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicCollection"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlBasicMap"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlTransformation"/>
-    <genClasses image="false" ecoreClass="eclipselink1_1_orm.ecore#//XmlVariableOneToOne"/>
-    <genClasses ecoreClass="eclipselink1_1_orm.ecore#//XmlTransient"/>
+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jpaResourceModels.genmodel#//orm">
+  <foreignModel>eclipselink_orm1_1.ecore</foreignModel>
+  <genPackages prefix="EclipseLink1_1Orm" basePackage="org.eclipse.jpt.eclipselink.core.v1_1.resource"
+      disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm1_1.ecore#/">
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//XmlEntityMappings"/>
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//XmlEntity"/>
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//XmlEmbeddable"/>
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//XmlMappedSuperclass"/>
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//Attributes"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlAttributeMapping"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlId"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlEmbeddedId"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlEmbedded"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlBasic">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference eclipselink_orm1_1.ecore#//XmlBasic/generatedValue"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlVersion"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlOneToOne"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlOneToMany"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlManyToOne"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlManyToMany"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlBasicCollection"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlBasicMap"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlTransformation"/>
+    <genClasses image="false" ecoreClass="eclipselink_orm1_1.ecore#//XmlVariableOneToOne"/>
+    <genClasses ecoreClass="eclipselink_orm1_1.ecore#//XmlTransient"/>
   </genPackages>
   <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.eclipselink.core.resource"
       disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index 1d22e7e08f..0e429732d8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/jptEclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -7,7 +7,7 @@
     editorPluginClass="" updateClasspath="false" rootExtendsInterface="org.eclipse.jpt.core.resource.xml.JpaEObject"
     rootExtendsClass="org.eclipse.jpt.core.resource.xml.AbstractJpaEObject" suppressInterfaces="true"
     testsDirectory="" testSuiteClass="" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jptResourceModels.genmodel#//orm">
+    complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.jpt.core/model/jpaResourceModels.genmodel#//orm">
   <foreignModel>eclipselink_orm.ecore</foreignModel>
   <genPackages prefix="EclipseLinkOrm" basePackage="org.eclipse.jpt.eclipselink.core.resource"
       disposableProviderFactory="true" adapterFactory="false" ecorePackage="eclipselink_orm.ecore#/">
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink1_1_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm1_1.ecore
index 39307024d7..765c24d28e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink1_1_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm1_1.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="orm"
-    nsURI="jpt.eclipselink1_1.orm.xmi" nsPrefix="org.eclipse.jpt.eclipselink1_1.core.resource.orm">
+    nsURI="jpt.eclipselink1_1.orm.xmi" nsPrefix="org.eclipse.jpt.eclipselink.core.v1_1.resource.orm">
   <eClassifiers xsi:type="ecore:EClass" name="XmlEntityMappings" eSuperTypes="eclipselink_orm.ecore#//XmlEntityMappings"/>
   <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="eclipselink_orm.ecore#//XmlEntity"/>
   <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="eclipselink_orm.ecore#//XmlEmbeddable"/>
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
index d31a2849f0..f254e04ae4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/plugin.xml
@@ -44,7 +44,7 @@
 	    
 	    <jpaPlatform
 	        id="eclipselink1_1"
-	        factoryClass="org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformFactory"
+	        factoryClass="org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformFactory"
 	        label="%ECLIPSELINK1_1_x_PLATFORM">
 	    </jpaPlatform>
 		
@@ -128,7 +128,7 @@
 		</resourceFactory>
 	    
 	    <resourceFactory
-	        class="org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmXmlResourceFactory"
+	        class="org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmXmlResourceFactory"
 	        isDefault="true">
 	       	<contentTypeBinding
 	             contentTypeId="org.eclipse.jpt.eclipselink1_1.core.content.orm">
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
index f72f4e7212..6dd65ce714 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/operations/EclipseLinkOrmFileCreationDataModelProvider.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaPlatformProvider;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
 
 public class EclipseLinkOrmFileCreationDataModelProvider extends OrmFileCreationDataModelProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaFactory.java
index 43270cf498..d44de7c3f4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1;
 
 import org.eclipse.jpt.core.context.MappingFile;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -50,6 +50,25 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicCollectionM
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmBasicMapMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmTransformationMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmVariableOneToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1EntityMappingsImpl;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmPersistentAttribute;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmPersistentType;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmXml;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlBasic;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlBasicCollection;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlBasicMap;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlEmbedded;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlEmbeddedId;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlId;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlManyToMany;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlManyToOne;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlNullAttributeMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlOneToMany;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlOneToOne;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlTransformation;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlTransient;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlVariableOneToOne;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1VirtualXmlVersion;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
@@ -63,28 +82,9 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1EntityMappingsImpl;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmPersistentAttribute;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmPersistentType;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmXml;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlBasic;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlBasicCollection;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlBasicMap;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlEmbedded;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlEmbeddedId;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlId;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlManyToMany;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlManyToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlNullAttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlOneToMany;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlTransformation;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlTransient;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1VirtualXmlVersion;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient;
 
 public class EclipseLink1_1JpaFactory
 	extends EclipseLinkJpaFactory
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java
index 304b830ed8..a3f6ceea21 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaPlatformFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1;
 
 import org.eclipse.jpt.core.JpaAnnotationProvider;
 import org.eclipse.jpt.core.JpaFactory;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformProvider.java
index 1871e2dcbf..7a7ddcd15f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1JpaPlatformProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1;
 
 import java.util.List;
 import org.eclipse.jpt.core.JpaPlatformProvider;
@@ -19,22 +19,22 @@ import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider;
 import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider;
 import org.eclipse.jpt.core.internal.platform.AbstractJpaPlatformProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.EclipseLink1_1MappingFileProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmBasicCollectionMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmBasicMapMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmBasicMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmEmbeddedIdMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmEmbeddedMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmIdMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmManyToManyMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmManyToOneMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmNullAttributeMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmOneToManyMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmTransformationMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmTransientMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmVariableOneToOneMappingProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.context.orm.EclipseLink1_1OrmVersionMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.EclipseLink1_1MappingFileProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmBasicCollectionMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmBasicMapMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmBasicMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmEmbeddedIdMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmEmbeddedMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmIdMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmManyToManyMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmManyToOneMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmNullAttributeMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmOneToManyMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmOneToOneMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmTransformationMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmTransientMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmVariableOneToOneMappingProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm.EclipseLink1_1OrmVersionMappingProvider;
 
 /**
  * EclipseLink platform
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1OrmResourceModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1OrmResourceModelProvider.java
index aed2f91af6..d1dc0e12b7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/EclipseLink1_1OrmResourceModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1OrmResourceModelProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.content.IContentType;
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.JpaProject;
 import org.eclipse.jpt.core.JpaResourceModelProvider;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
 
 /**
  * EclipseLink orm.xml
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/EclipseLink1_1MappingFileProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/EclipseLink1_1MappingFileProvider.java
index 49d8b87890..fe1725641e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/EclipseLink1_1MappingFileProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/EclipseLink1_1MappingFileProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -16,7 +16,7 @@ import org.eclipse.jpt.core.context.MappingFileProvider;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 
 public class EclipseLink1_1MappingFileProvider
 	implements MappingFileProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1EntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1EntityMappingsImpl.java
index 0e74d1cfc1..cdabb2837e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1EntityMappingsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1EntityMappingsImpl.java
@@ -7,13 +7,13 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappingsImpl;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings;
 
 public class EclipseLink1_1EntityMappingsImpl
 	extends EclipseLinkEntityMappingsImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java
index 14cea7906b..f2a898ac0b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicCollectionMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectionMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicCollection;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmBasicCollectionMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java
index 432d157744..eeadade98a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicMapMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasicMap;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmBasicMapMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicMappingProvider.java
index bdc13e8bcf..2b5e89cd75 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmBasicMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmBasicMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlBasic;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmBasicMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java
index b61f332dc4..ac01c2f137 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmEmbeddedIdMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbeddedId;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmEmbeddedIdMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java
index bc55b88d7a..a3f1f0d015 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmEmbeddedMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEmbedded;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmEmbeddedMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmIdMappingProvider.java
index 8ff39a061b..0e3f773915 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmIdMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmIdMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlId;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmIdMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java
index be98e4ac9b..21206f634e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmManyToManyMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToMany;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmManyToManyMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java
index d44c0328c0..c196a62f94 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmManyToOneMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlManyToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmManyToOneMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java
index 93f1e90277..feacb56530 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmNullAttributeMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,7 +20,7 @@ import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 
 public class EclipseLink1_1OrmNullAttributeMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java
index cae2da7d97..aed7586f72 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmOneToManyMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToMany;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmOneToManyMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java
index 4321eebb63..3e1f1e08d2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmOneToOneMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmOneToOneMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmPersistentAttribute.java
index e2ae4a44b4..207f0b9b4f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmPersistentAttribute.java
@@ -7,12 +7,12 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.jpt.core.context.AccessType;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmPersistentAttribute;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping;
 
 
 public class EclipseLink1_1OrmPersistentAttribute 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmPersistentType.java
index 4ee1407a7b..04c273aaf9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmPersistentType.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import java.util.Iterator;
 import org.eclipse.jpt.core.context.AccessType;
@@ -18,9 +18,9 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.orm.Attributes;
 import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping;
 
 public class EclipseLink1_1OrmPersistentType extends AbstractOrmPersistentType
 {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java
index 676c0a35d0..44d03e437b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmTransformationMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformationMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTransformation;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmTransformationMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmTransientMappingProvider.java
index 6534cd7b2b..a4d910ac90 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmTransientMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmTransientMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient;
 
 public class EclipseLink1_1OrmTransientMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java
index ef3313bdde..63d49d3228 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmVariableOneToOneMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVariableOneToOne;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmVariableOneToOneMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmVersionMappingProvider.java
index 11a4ac6dbd..8505f45e62 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmVersionMappingProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmVersionMappingProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JpaFactory;
@@ -20,9 +20,9 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
 
 public class EclipseLink1_1OrmVersionMappingProvider
 	implements OrmAttributeMappingProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmXml.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmXml.java
index bd3fd5c92c..f7f3dbeba6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1OrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1OrmXml.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.persistence.MappingFileRef;
 import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXml;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings;
 
 public class EclipseLink1_1OrmXml extends AbstractOrmXml
 {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasic.java
index 5cd726de06..df2101beaa 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasic.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaBasicMapping;
@@ -28,7 +28,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java
index 646332f408..500f882fc2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasicCollection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
@@ -17,7 +17,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicCollectio
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlBasicCollection;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasicMap.java
index 76b5a2c0f7..2823d5de10 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlBasicMap.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlBasicMap.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
@@ -17,7 +17,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaBasicMapMappin
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlBasicMap;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlEmbedded.java
index 1e8e35025a..a687e25a02 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlEmbedded.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping;
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlEmbedded;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java
index 73c1faf86c..62bcf100c6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlEmbeddedId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping;
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlEmbeddedId;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlId.java
index 23040a2650..3b19ef8488 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaIdMapping;
@@ -27,7 +27,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlManyToMany.java
index 5f2cf9f7ff..32bc0af927 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlManyToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaManyToManyMapping;
@@ -23,7 +23,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualX
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlManyToOne.java
index 54334d832a..9b37cae057 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlManyToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaManyToOneMapping;
@@ -22,7 +22,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualX
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java
index 685fa06908..33dcf360ce 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlNullAttributeMapping.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaAttributeMapping;
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlNullAttributeMapping;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping;
 
 /**
  * VirtualVersion is an implementation of Version used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlOneToMany.java
index 2eaa2f61d9..5379146d11 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlOneToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
@@ -23,7 +23,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualX
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlOneToOne.java
index 5ce7263206..7a5b296f22 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlOneToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
@@ -23,7 +23,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualX
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlJoinFetchType;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlTransformation.java
index 84b175741e..0dc95e7c80 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlTransformation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlTransformation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
@@ -17,7 +17,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaTransformation
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlTransformation;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlTransient.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlTransient.java
index 29ab2c7365..fa3582e030 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlTransient.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlTransient.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.jpt.core.context.java.JavaTransientMapping;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.resource.orm.AccessType;
 import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkVirtualXmlTransient;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java
index db3f86f993..4957140a0b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlVariableOneToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.resource.orm.AccessType;
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaVariableOneToOneMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.VirtualXmlVariableOneToOne;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlAccessMethods;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlVersion.java
index 9970a0bb92..f6ce565c5c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/context/orm/EclipseLink1_1VirtualXmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/context/orm/EclipseLink1_1VirtualXmlVersion.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.context.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.context.orm;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.jpt.core.context.java.JavaVersionMapping;
@@ -24,7 +24,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.XmlObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlProperty;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlStructConverter;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlTypeConverter;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion;
 
 /**
  * VirtualBasic is an implementation of Basic used when there is 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java
index cc9bbb800d..3654c48cfd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/operations/EclipseLink1_1OrmFileCreationDataModelProvider.java
@@ -8,12 +8,12 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.operations;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.operations;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
 
 public class EclipseLink1_1OrmFileCreationDataModelProvider extends OrmFileCreationDataModelProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/operations/EclipseLink1_1OrmFileCreationOperation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/operations/EclipseLink1_1OrmFileCreationOperation.java
index 629e71cdaa..2b54d5c8bf 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/operations/EclipseLink1_1OrmFileCreationOperation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/operations/EclipseLink1_1OrmFileCreationOperation.java
@@ -7,14 +7,14 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.operations;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.operations;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationOperation;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
 import org.eclipse.jpt.core.resource.orm.XmlPersistenceUnitMetadata;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
 import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 public class EclipseLink1_1OrmFileCreationOperation extends OrmFileCreationOperation
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java
index 2d952cde22..b4cb885342 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/internal/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/resource/orm/EclipseLink1_1OrmXmlResourceProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm;
+package org.eclipse.jpt.eclipselink.core.internal.v1_1.resource.orm;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -17,8 +17,8 @@ import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.core.resource.AbstractXmlResourceProvider;
 import org.eclipse.jpt.core.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.JPA;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.JPA;
 
 public class EclipseLink1_1OrmXmlResourceProvider
 	extends AbstractXmlResourceProvider
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
index 8eb544166e..fcba49bc94 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/EclipseLinkOrmPackage.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
 import org.eclipse.jpt.core.resource.orm.OrmPackage;
-import org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage;
+import org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/Attributes.java
index 0e4d2ca2c4..3758b34415 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/Attributes.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/Attributes.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -23,7 +23,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmFactory.java
index 768d69b3eb..cbeddb7bc2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage
  * @generated
  */
 public class EclipseLink1_1OrmFactory extends EFactoryImpl
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmPackage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmPackage.java
index d56b148da8..03709cc496 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmPackage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmPackage.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
@@ -30,7 +30,7 @@ import org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmFactory
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmFactory
  * @model kind="package"
  * @generated
  */
@@ -58,7 +58,7 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final String eNS_PREFIX = "org.eclipse.jpt.eclipselink1_1.core.resource.orm";
+	public static final String eNS_PREFIX = "org.eclipse.jpt.eclipselink.core.v1_1.resource.orm";
 
 	/**
 	 * The singleton instance of the package.
@@ -66,14 +66,14 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final EclipseLink1_1OrmPackage eINSTANCE = org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage.init();
+	public static final EclipseLink1_1OrmPackage eINSTANCE = org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
 	 * @generated
 	 */
 	public static final int XML_ENTITY_MAPPINGS = 0;
@@ -268,11 +268,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ENTITY_MAPPINGS_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ENTITY_MAPPINGS_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
 	 * @generated
 	 */
 	public static final int XML_ENTITY = 1;
@@ -701,11 +701,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ENTITY_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ENTITY_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDABLE = 2;
@@ -864,11 +864,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_EMBEDDABLE_FEATURE_COUNT = EclipseLinkOrmPackage.XML_EMBEDDABLE_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
 	 * @generated
 	 */
 	public static final int XML_MAPPED_SUPERCLASS = 3;
@@ -1162,11 +1162,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_MAPPED_SUPERCLASS_FEATURE_COUNT = EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes <em>Attributes</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes <em>Attributes</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
 	 * @generated
 	 */
 	public static final int ATTRIBUTES = 4;
@@ -1307,11 +1307,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int ATTRIBUTES_FEATURE_COUNT = EclipseLinkOrmPackage.ATTRIBUTES_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
 	 * @generated
 	 */
 	public static final int XML_ATTRIBUTE_MAPPING = 5;
@@ -1362,11 +1362,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ATTRIBUTE_MAPPING_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ATTRIBUTE_MAPPING_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId <em>Xml Id</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
 	 * @generated
 	 */
 	public static final int XML_ID = 6;
@@ -1534,11 +1534,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ID_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ID_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDED_ID = 7;
@@ -1598,11 +1598,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_EMBEDDED_ID_FEATURE_COUNT = EclipseLinkOrmPackage.XML_EMBEDDED_ID_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
 	 * @generated
 	 */
 	public static final int XML_EMBEDDED = 8;
@@ -1662,11 +1662,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_EMBEDDED_FEATURE_COUNT = EclipseLinkOrmPackage.XML_EMBEDDED_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
 	 * @generated
 	 */
 	public static final int XML_BASIC = 9;
@@ -1852,11 +1852,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_BASIC_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion <em>Xml Version</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
 	 * @generated
 	 */
 	public static final int XML_VERSION = 10;
@@ -1997,11 +1997,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_VERSION_FEATURE_COUNT = EclipseLinkOrmPackage.XML_VERSION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
 	 * @generated
 	 */
 	public static final int XML_ONE_TO_ONE = 11;
@@ -2142,11 +2142,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ONE_TO_ONE_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ONE_TO_ONE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
 	 * @generated
 	 */
 	public static final int XML_ONE_TO_MANY = 12;
@@ -2287,11 +2287,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_ONE_TO_MANY_FEATURE_COUNT = EclipseLinkOrmPackage.XML_ONE_TO_MANY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
 	 * @generated
 	 */
 	public static final int XML_MANY_TO_ONE = 13;
@@ -2405,11 +2405,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_MANY_TO_ONE_FEATURE_COUNT = EclipseLinkOrmPackage.XML_MANY_TO_ONE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
 	 * @generated
 	 */
 	public static final int XML_MANY_TO_MANY = 14;
@@ -2532,11 +2532,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_MANY_TO_MANY_FEATURE_COUNT = EclipseLinkOrmPackage.XML_MANY_TO_MANY_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
 	 * @generated
 	 */
 	public static final int XML_BASIC_COLLECTION = 15;
@@ -2587,11 +2587,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_BASIC_COLLECTION_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_COLLECTION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
 	 * @generated
 	 */
 	public static final int XML_BASIC_MAP = 16;
@@ -2642,11 +2642,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_BASIC_MAP_FEATURE_COUNT = EclipseLinkOrmPackage.XML_BASIC_MAP_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
 	 * @generated
 	 */
 	public static final int XML_TRANSFORMATION = 17;
@@ -2697,11 +2697,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_TRANSFORMATION_FEATURE_COUNT = EclipseLinkOrmPackage.XML_TRANSFORMATION_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
 	 * @generated
 	 */
 	public static final int XML_VARIABLE_ONE_TO_ONE = 18;
@@ -2752,11 +2752,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public static final int XML_VARIABLE_ONE_TO_ONE_FEATURE_COUNT = EclipseLinkOrmPackage.XML_VARIABLE_ONE_TO_ONE_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
 	 * @generated
 	 */
 	public static final int XML_TRANSIENT = 19;
@@ -2957,7 +2957,7 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#eNS_URI
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
@@ -3019,11 +3019,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Entity Mappings</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings
 	 * @generated
 	 */
 	public EClass getXmlEntityMappings()
@@ -3033,11 +3033,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity <em>Xml Entity</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity <em>Xml Entity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Entity</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity
 	 * @generated
 	 */
 	public EClass getXmlEntity()
@@ -3047,11 +3047,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embeddable</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable
 	 * @generated
 	 */
 	public EClass getXmlEmbeddable()
@@ -3061,11 +3061,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Mapped Superclass</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass
 	 * @generated
 	 */
 	public EClass getXmlMappedSuperclass()
@@ -3075,11 +3075,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes <em>Attributes</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes <em>Attributes</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Attributes</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes
 	 * @generated
 	 */
 	public EClass getAttributes()
@@ -3089,11 +3089,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Attribute Mapping</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping
 	 * @generated
 	 */
 	public EClass getXmlAttributeMapping()
@@ -3103,11 +3103,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId <em>Xml Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Id</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId
 	 * @generated
 	 */
 	public EClass getXmlId()
@@ -3116,11 +3116,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embedded Id</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId
 	 * @generated
 	 */
 	public EClass getXmlEmbeddedId()
@@ -3129,11 +3129,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded <em>Xml Embedded</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Embedded</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded
 	 * @generated
 	 */
 	public EClass getXmlEmbedded()
@@ -3142,11 +3142,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic <em>Xml Basic</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Basic</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic
 	 * @generated
 	 */
 	public EClass getXmlBasic()
@@ -3155,11 +3155,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Generated Value</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getGeneratedValue()
 	 * @see #getXmlBasic()
 	 * @generated
 	 */
@@ -3170,11 +3170,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion <em>Xml Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Version</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion
 	 * @generated
 	 */
 	public EClass getXmlVersion()
@@ -3183,11 +3183,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne <em>Xml One To One</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml One To One</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne
 	 * @generated
 	 */
 	public EClass getXmlOneToOne()
@@ -3196,11 +3196,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany <em>Xml One To Many</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml One To Many</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany
 	 * @generated
 	 */
 	public EClass getXmlOneToMany()
@@ -3209,11 +3209,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne <em>Xml Many To One</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Many To One</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne
 	 * @generated
 	 */
 	public EClass getXmlManyToOne()
@@ -3222,11 +3222,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Many To Many</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany
 	 * @generated
 	 */
 	public EClass getXmlManyToMany()
@@ -3235,11 +3235,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Basic Collection</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection
 	 * @generated
 	 */
 	public EClass getXmlBasicCollection()
@@ -3248,11 +3248,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Basic Map</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap
 	 * @generated
 	 */
 	public EClass getXmlBasicMap()
@@ -3261,11 +3261,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation <em>Xml Transformation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Transformation</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation
 	 * @generated
 	 */
 	public EClass getXmlTransformation()
@@ -3274,11 +3274,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Variable One To One</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne
 	 * @generated
 	 */
 	public EClass getXmlVariableOneToOne()
@@ -3287,11 +3287,11 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	}
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient <em>Xml Transient</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Xml Transient</em>'.
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient
 	 * @generated
 	 */
 	public EClass getXmlTransient()
@@ -3505,101 +3505,101 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 	public interface Literals
 	{
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings <em>Xml Entity Mappings</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntityMappings
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntityMappings
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
 		 * @generated
 		 */
 		public static final EClass XML_ENTITY_MAPPINGS = eINSTANCE.getXmlEntityMappings();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity <em>Xml Entity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEntity
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEntity
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
 		 * @generated
 		 */
 		public static final EClass XML_ENTITY = eINSTANCE.getXmlEntity();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable <em>Xml Embeddable</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddable
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddable
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDABLE = eINSTANCE.getXmlEmbeddable();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass <em>Xml Mapped Superclass</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlMappedSuperclass
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlMappedSuperclass
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
 		 * @generated
 		 */
 		public static final EClass XML_MAPPED_SUPERCLASS = eINSTANCE.getXmlMappedSuperclass();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes <em>Attributes</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes <em>Attributes</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.Attributes
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.Attributes
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getAttributes()
 		 * @generated
 		 */
 		public static final EClass ATTRIBUTES = eINSTANCE.getAttributes();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping <em>Xml Attribute Mapping</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlAttributeMapping
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlAttributeMapping
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
 		 * @generated
 		 */
 		public static final EClass XML_ATTRIBUTE_MAPPING = eINSTANCE.getXmlAttributeMapping();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId <em>Xml Id</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId <em>Xml Id</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
 		 * @generated
 		 */
 		public static final EClass XML_ID = eINSTANCE.getXmlId();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId <em>Xml Embedded Id</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDED_ID = eINSTANCE.getXmlEmbeddedId();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded <em>Xml Embedded</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
 		 * @generated
 		 */
 		public static final EClass XML_EMBEDDED = eINSTANCE.getXmlEmbedded();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic <em>Xml Basic</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
 		 * @generated
 		 */
 		public static final EClass XML_BASIC = eINSTANCE.getXmlBasic();
@@ -3613,101 +3613,101 @@ public class EclipseLink1_1OrmPackage extends EPackageImpl
 		public static final EReference XML_BASIC__GENERATED_VALUE = eINSTANCE.getXmlBasic_GeneratedValue();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion <em>Xml Version</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion <em>Xml Version</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
 		 * @generated
 		 */
 		public static final EClass XML_VERSION = eINSTANCE.getXmlVersion();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne <em>Xml One To One</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
 		 * @generated
 		 */
 		public static final EClass XML_ONE_TO_ONE = eINSTANCE.getXmlOneToOne();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany <em>Xml One To Many</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
 		 * @generated
 		 */
 		public static final EClass XML_ONE_TO_MANY = eINSTANCE.getXmlOneToMany();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne <em>Xml Many To One</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
 		 * @generated
 		 */
 		public static final EClass XML_MANY_TO_ONE = eINSTANCE.getXmlManyToOne();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany <em>Xml Many To Many</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
 		 * @generated
 		 */
 		public static final EClass XML_MANY_TO_MANY = eINSTANCE.getXmlManyToMany();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection <em>Xml Basic Collection</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
 		 * @generated
 		 */
 		public static final EClass XML_BASIC_COLLECTION = eINSTANCE.getXmlBasicCollection();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap <em>Xml Basic Map</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
 		 * @generated
 		 */
 		public static final EClass XML_BASIC_MAP = eINSTANCE.getXmlBasicMap();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation <em>Xml Transformation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
 		 * @generated
 		 */
 		public static final EClass XML_TRANSFORMATION = eINSTANCE.getXmlTransformation();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne <em>Xml Variable One To One</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
 		 * @generated
 		 */
 		public static final EClass XML_VARIABLE_ONE_TO_ONE = eINSTANCE.getXmlVariableOneToOne();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient <em>Xml Transient</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient
-		 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient
+		 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
 		 * @generated
 		 */
 		public static final EClass XML_TRANSIENT = eINSTANCE.getXmlTransient();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java
index 7e34388224..6201c920d0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/EclipseLink1_1OrmXmlResourceFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/JPA.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/JPA.java
index 8b982bb0d3..0209b8e664 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/JPA.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/JPA.java
@@ -6,7 +6,7 @@
  * 
  * Contributors: Oracle. - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 @SuppressWarnings("nls")
 public interface JPA
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlAttributeMapping.java
index 6ed5b1755a..77e6bcf809 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlAttributeMapping.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.jpt.core.resource.orm.XmlAccessHolder;
 
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.resource.orm.XmlAccessHolder;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAttributeMapping()
  * @model kind="class" interface="true" abstract="true"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasic.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasic.java
index 2c27bb9106..fbdcb45bd3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasic.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasic.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -36,11 +36,11 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}</li>
+ *   <li>{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic()
  * @model kind="class"
  * @generated
  */
@@ -125,7 +125,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -135,7 +135,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
@@ -161,7 +161,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Generated Value</em>' containment reference.
 	 * @see #setGeneratedValue(XmlGeneratedValue)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_GeneratedValue()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasic_GeneratedValue()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -188,7 +188,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getGeneratedValue <em>Generated Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Generated Value</em>' containment reference.
@@ -221,7 +221,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Table Generator</em>' containment reference.
 	 * @see #setTableGenerator(XmlTableGenerator)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlGeneratorContainer_TableGenerator()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlGeneratorContainer_TableGenerator()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -248,7 +248,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getTableGenerator <em>Table Generator</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getTableGenerator <em>Table Generator</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Table Generator</em>' containment reference.
@@ -281,7 +281,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Sequence Generator</em>' containment reference.
 	 * @see #setSequenceGenerator(XmlSequenceGenerator)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlGeneratorContainer_SequenceGenerator()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlGeneratorContainer_SequenceGenerator()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -308,7 +308,7 @@ public class XmlBasic extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlB
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasic#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasic#getSequenceGenerator <em>Sequence Generator</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Sequence Generator</em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollection.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasicCollection.java
index 8e8b7e6594..6545db09f5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasicCollection.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicCollection()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlBasicCollection extends org.eclipse.jpt.eclipselink.core.resourc
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlBasicCollection extends org.eclipse.jpt.eclipselink.core.resourc
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicCollection#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicCollection#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMap.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasicMap.java
index d0a8cb02c8..0c33821a20 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlBasicMap.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlBasicMap.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlBasicMap()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlBasicMap extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlBasicMap extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlBasicMap#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlBasicMap#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbeddable.java
index bf64ef2634..5fcfd359e4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddable.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbeddable.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -20,7 +20,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddable()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbedded.java
index f33630365a..05fedd197f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbedded.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbedded.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbedded()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlEmbedded extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlEmbedded extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbedded#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbedded#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbeddedId.java
index a670cf8231..247e0ece7f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEmbeddedId.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEmbeddedId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEmbeddedId()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlEmbeddedId extends org.eclipse.jpt.eclipselink.core.resource.orm
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlEmbeddedId extends org.eclipse.jpt.eclipselink.core.resource.orm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlEmbeddedId#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlEmbeddedId#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEntity.java
index b9d975e834..bd663916bf 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEntity.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -20,7 +20,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntity()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEntityMappings.java
index 2d2fbaf0f6..30c660c863 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlEntityMappings.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.jpt.core.internal.resource.xml.translators.SimpleRootTranslator;
@@ -34,7 +34,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlEntityMappings()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlId.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlId.java
index 9e1f7b0d80..3145511f67 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlId.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlId.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlId()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlId extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlId i
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlId extends org.eclipse.jpt.eclipselink.core.resource.orm.XmlId i
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlId#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlId#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlManyToMany.java
index a0257c3d3e..b820fc067e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlManyToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToMany()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlManyToMany extends org.eclipse.jpt.eclipselink.core.resource.orm
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlManyToMany extends org.eclipse.jpt.eclipselink.core.resource.orm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToMany#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToMany#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlManyToOne.java
index 6446a3bd8c..d6cd6d9bcb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlManyToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlManyToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlManyToOne()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlManyToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlManyToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlManyToOne#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlManyToOne#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlMappedSuperclass.java
index 1e948c97bb..80c96bfad8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlMappedSuperclass.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -20,7 +20,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlMappedSuperclass()
  * @model kind="class"
  * @generated
  */
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlOneToMany.java
index e901de3c03..a16e322cd7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlOneToMany.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToMany()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlOneToMany extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlOneToMany extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToMany#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToMany#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlOneToOne.java
index f695c12dae..6340e1f4f4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlOneToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlOneToOne()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlOneToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlOneToOne extends org.eclipse.jpt.eclipselink.core.resource.orm.X
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlOneToOne#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlOneToOne#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformation.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlTransformation.java
index bf6fbe3d16..da1d4b73ac 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransformation.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlTransformation.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransformation()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlTransformation extends org.eclipse.jpt.eclipselink.core.resource
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlTransformation extends org.eclipse.jpt.eclipselink.core.resource
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransformation#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransformation#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransient.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlTransient.java
index b9e048d9d1..1ea54c036f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlTransient.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlTransient.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlTransient()
  * @model kind="class"
  * @generated
  */
@@ -87,7 +87,7 @@ public class XmlTransient extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -97,7 +97,7 @@ public class XmlTransient extends org.eclipse.jpt.eclipselink.core.resource.orm.
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlTransient#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlTransient#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOne.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlVariableOneToOne.java
index e4208882f1..817bb55519 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVariableOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlVariableOneToOne.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVariableOneToOne()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlVariableOneToOne extends org.eclipse.jpt.eclipselink.core.resour
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlVariableOneToOne extends org.eclipse.jpt.eclipselink.core.resour
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVariableOneToOne#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVariableOneToOne#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersion.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlVersion.java
index 51aeb84bd9..dfb55780ba 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink1_1/core/resource/orm/XmlVersion.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/v1_1/resource/orm/XmlVersion.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.core.resource.orm;
+package org.eclipse.jpt.eclipselink.core.v1_1.resource.orm;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -28,7 +28,7 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
  * <!-- end-user-doc -->
  *
  *
- * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
+ * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlVersion()
  * @model kind="class"
  * @generated
  */
@@ -83,7 +83,7 @@ public class XmlVersion extends org.eclipse.jpt.eclipselink.core.resource.orm.Xm
 	 * @return the value of the '<em>Access</em>' attribute.
 	 * @see org.eclipse.jpt.core.resource.orm.AccessType
 	 * @see #setAccess(AccessType)
-	 * @see org.eclipse.jpt.eclipselink1_1.core.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
+	 * @see org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.EclipseLink1_1OrmPackage#getXmlAccessHolder_Access()
 	 * @model
 	 * @generated
 	 */
@@ -93,7 +93,7 @@ public class XmlVersion extends org.eclipse.jpt.eclipselink.core.resource.orm.Xm
 	}
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink1_1.core.resource.orm.XmlVersion#getAccess <em>Access</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.jpt.eclipselink.core.v1_1.resource.orm.XmlVersion#getAccess <em>Access</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Access</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
index a69dac1ad7..f9d4d21a23 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/META-INF/MANIFEST.MF
@@ -39,12 +39,12 @@ Export-Package: org.eclipse.jpt.eclipselink.ui,
  org.eclipse.jpt.eclipselink.ui.internal.persistencexml.details;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.platform;x-internal:=true,
  org.eclipse.jpt.eclipselink.ui.internal.structure;x-internal:=true,
- org.eclipse.jpt.eclipselink.ui.internal.wizards;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal.platform;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal.structure;x-internal:=true,
- org.eclipse.jpt.eclipselink1_1.ui.internal.wizards;x-internal:=true
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1.structure;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.v1_1.wizards;x-internal:=true,
+ org.eclipse.jpt.eclipselink.ui.internal.wizards;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.ibm.icu.text;version="4.0.1"
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
index b931c8441e..294f172c03 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
@@ -13,7 +13,7 @@
 		<jpaPlatformUi
 			id="eclipselink1_1.ui"
 			jpaPlatform="eclipselink1_1"
-			factoryClass="org.eclipse.jpt.eclipselink1_1.ui.internal.platform.EclipseLink1_1JpaPlatformUiFactory"/>
+			factoryClass="org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform.EclipseLink1_1JpaPlatformUiFactory"/>
 		
 	</extension>
    
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/EclipseLink1_1JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
index 63fe2c4c79..c64dd797cd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/EclipseLink1_1JpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
@@ -7,15 +7,15 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1;
 
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkJpaUiFactory;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaEmbeddableComposite;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaEntityComposite;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.java.details.EclipseLink1_1JavaMappedSuperclassComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaEmbeddableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaEntityComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.EclipseLink1_1JavaMappedSuperclassComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java
index 04aed00fb3..34692f2ac9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java
index 73bb441122..01177aac86 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEntity;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
index f8d64a990d..51fa11d794 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.java.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
index 1706e9e5c0..6fbd6e5bbe 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
index 89864de7d8..0fc1a59c28 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.BasicCollectionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
index e158f2152b..cf5e8a7679 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
index e3da2886e3..46f9626a73 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.BasicMapMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
index 10e9b53640..187b754c60 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.BasicMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
index 1398534bfd..cfa7d93001 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
index f6f9e57bc1..928a96d0f5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.ConverterHolder;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
index 822b1fd54a..8788e5aaa7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
index cba71989b5..caa2e24cda 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedIdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
index 243f6dd74c..d3c459f204 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmEmbeddedIdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
index da10997f28..41269bf728 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
index 2346ac9277..6aaf6b94ca 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmEmbeddedMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEntityUiProvider.java
index bc74a18b9f..760f49a6d0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmEntityUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEntityUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java
index 40536d211a..0d864d8003 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.IdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
index 7886a464c3..ebdcf325a9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
index 910045ab79..482d5491ac 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
index fcfe60392b..b5c0c3cce6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
index f9364f1b86..ce2cb68ccc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
index dd96870968..07dee115fc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
index e66c3c88eb..3f7cd78b3d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmMappedSuperclassUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
index 829a2fb8e6..e089e1ff19 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
index ee73ad7f92..a5b2ce0544 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
index b67387ead3..e853c86c4c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
index 194c092021..9876b35557 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
index 7677e71637..889109d1a3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransformationMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.TransformationMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
index 20225d8b36..27df3cdb1c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmTransientMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.context.orm.OrmTransientMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
index 3c4d152d6f..f954aae08c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVariableOneToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.VariableOneToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
index 3e9b83059c..d74637ee33 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.VersionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
index 4c2238a2e7..ecd05d4dd7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiFactory.java
index ae926175e2..3ceb8536c5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.platform;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;
 
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkJpaUiFactory;
 import org.eclipse.jpt.eclipselink.ui.internal.platform.EclipseLinkJpaPlatformUi;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
index 353c3bbf99..c325c5b4fb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/platform/EclipseLink1_1JpaPlatformUiProvider.java
@@ -7,28 +7,28 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.platform;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.platform;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicCollectionMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicMapMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmBasicMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddableUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddedIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEmbeddedMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmEntityUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmManyToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmManyToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmMappedSuperclassUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmOneToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmTransientMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.orm.details.EclipseLink1_1OrmVersionMappingUiProvider;
-import org.eclipse.jpt.eclipselink1_1.ui.internal.structure.EclipseLink1_1OrmResourceModelStructureProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicCollectionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicMapMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmBasicMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddableUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddedIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEmbeddedMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmEntityUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmManyToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmManyToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmMappedSuperclassUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmOneToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmTransformationMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmTransientMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmVariableOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLink1_1OrmVersionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.structure.EclipseLink1_1OrmResourceModelStructureProvider;
 import org.eclipse.jpt.ui.JpaPlatformUiProvider;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
 import org.eclipse.jpt.ui.details.DefaultAttributeMappingUiProvider;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/structure/EclipseLink1_1OrmResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
index 1bfdfa72ad..c38e15d2f7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/structure/EclipseLink1_1OrmResourceModelStructureProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.structure;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.structure;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/wizards/EclipseLink1_1MappingFileWizard.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/wizards/EclipseLink1_1MappingFileWizard.java
index 56f119eb9b..aab7947837 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink1_1/ui/internal/wizards/EclipseLink1_1MappingFileWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/wizards/EclipseLink1_1MappingFileWizard.java
@@ -8,11 +8,11 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt.eclipselink1_1.ui.internal.wizards;
+package org.eclipse.jpt.eclipselink.ui.internal.v1_1.wizards;
 
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.wizards.EclipseLinkMappingFileWizardPage;
-import org.eclipse.jpt.eclipselink1_1.core.internal.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
 import org.eclipse.jpt.ui.internal.wizards.orm.MappingFileWizard;
 import org.eclipse.jpt.ui.internal.wizards.orm.MappingFileWizardPage;
 import org.eclipse.ui.INewWizard;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
index f49d5c398f..df2be37f98 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
@@ -47,6 +47,11 @@ Export-Package: org.eclipse.jpt.ui,
  org.eclipse.jpt.ui.internal.editors;x-internal:=true,
  org.eclipse.jpt.ui.internal.java.details;x-internal:=true,
  org.eclipse.jpt.ui.internal.jface;x-internal:=true,
+ org.eclipse.jpt.ui.internal.jpa2;x-internal:=true,
+ org.eclipse.jpt.ui.internal.jpa2.java.details;x-internal:=true,
+ org.eclipse.jpt.ui.internal.jpa2.orm.details;x-internal:=true,
+ org.eclipse.jpt.ui.internal.jpa2.platform.generic;x-internal:=true,
+ org.eclipse.jpt.ui.internal.jpa2.structure;x-internal:=true,
  org.eclipse.jpt.ui.internal.listeners;x-internal:=true,
  org.eclipse.jpt.ui.internal.mappings;x-internal:=true,
  org.eclipse.jpt.ui.internal.mappings.db;x-internal:=true,
@@ -77,11 +82,6 @@ Export-Package: org.eclipse.jpt.ui,
  org.eclipse.jpt.ui.internal.wizards.orm;x-internal:=true,
  org.eclipse.jpt.ui.jface,
  org.eclipse.jpt.ui.navigator,
- org.eclipse.jpt.ui.structure,
- org.eclipse.jpt2_0.ui.internal;x-internal:=true,
- org.eclipse.jpt2_0.ui.internal.java.details;x-internal:=true,
- org.eclipse.jpt2_0.ui.internal.orm.details;x-internal:=true,
- org.eclipse.jpt2_0.ui.internal.platform.generic;x-internal:=true,
- org.eclipse.jpt2_0.ui.internal.structure;x-internal:=true
+ org.eclipse.jpt.ui.structure
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: com.ibm.icu.text;version="4.0.1"
diff --git a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
index e2b2dbb279..56947f831c 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
@@ -80,7 +80,7 @@
 			jpaPlatform="generic"
 			factoryClass="org.eclipse.jpt.ui.internal.platform.generic.GenericJpaPlatformUiFactory"/>
   <jpaPlatformUi
-        factoryClass="org.eclipse.jpt2_0.ui.internal.platform.generic.Generic2_0JpaPlatformUiFactory"
+        factoryClass="org.eclipse.jpt.ui.internal.jpa2.platform.generic.Generic2_0JpaPlatformUiFactory"
         id="generic2_0.ui"
         jpaPlatform="generic2_0">
   </jpaPlatformUi>
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/Generic2_0JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java
index bd844225e7..0716d9943a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/Generic2_0JpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal;
+package org.eclipse.jpt.ui.internal.jpa2;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.AttributeMapping;
@@ -18,21 +18,21 @@ import org.eclipse.jpt.ui.details.DefaultTypeMappingUiProvider;
 import org.eclipse.jpt.ui.details.JpaDetailsProvider;
 import org.eclipse.jpt.ui.details.TypeMappingUiProvider;
 import org.eclipse.jpt.ui.internal.AbstractJpaPlatformUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0BasicMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0EmbeddableUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0EmbeddedIdMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0EmbeddedMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0EntityUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0IdMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0ManyToManyMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0ManyToOneMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0MappedSuperclassUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0OneToManyMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0OneToOneMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0TransientMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.Orm2_0VersionMappingUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.structure.Orm2_0ResourceModelStructureProvider;
 import org.eclipse.jpt.ui.structure.JpaStructureProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0BasicMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0EmbeddableUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0EmbeddedIdMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0EmbeddedMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0EntityUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0IdMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0ManyToManyMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0ManyToOneMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0MappedSuperclassUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0OneToManyMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0OneToOneMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0TransientMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.orm.details.Orm2_0VersionMappingUiProvider;
-import org.eclipse.jpt2_0.ui.internal.structure.Orm2_0ResourceModelStructureProvider;
 
 /**
  * All the state in the JPA platform should be "static" (i.e. unchanging once
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/Generic2_0JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java
index 577ab22e62..e40fb39492 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/Generic2_0JpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal;
+package org.eclipse.jpt.ui.internal.jpa2;
 
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.core.context.java.JavaEntity;
@@ -15,10 +15,10 @@ import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.ui.internal.GenericJpaUiFactory;
+import org.eclipse.jpt.ui.internal.jpa2.java.details.Java2_0EmbeddableComposite;
+import org.eclipse.jpt.ui.internal.jpa2.java.details.Java2_0EntityComposite;
+import org.eclipse.jpt.ui.internal.jpa2.java.details.Java2_0MappedSuperclassComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt2_0.ui.internal.java.details.Java2_0EmbeddableComposite;
-import org.eclipse.jpt2_0.ui.internal.java.details.Java2_0EntityComposite;
-import org.eclipse.jpt2_0.ui.internal.java.details.Java2_0MappedSuperclassComposite;
 import org.eclipse.swt.widgets.Composite;
 
 /**
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0EmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0EmbeddableComposite.java
index c3726eb49b..12b3e0ba52 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0EmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0EmbeddableComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.java.details;
+package org.eclipse.jpt.ui.internal.jpa2.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.Embeddable;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0EntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0EntityComposite.java
index b931fa6473..9a0843d61e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0EntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0EntityComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.java.details;
+package org.eclipse.jpt.ui.internal.jpa2.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaEntity;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0MappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0MappedSuperclassComposite.java
index 0a2487a84f..dfb77a00a8 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/java/details/Java2_0MappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/java/details/Java2_0MappedSuperclassComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.java.details;
+package org.eclipse.jpt.ui.internal.jpa2.java.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0BasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0BasicMappingComposite.java
index 81be4bda35..a0a8551774 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0BasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0BasicMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.BasicMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0BasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0BasicMappingUiProvider.java
index aff9be4929..36da840553 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0BasicMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0BasicMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddableUiProvider.java
index 384ba42226..e80bdfeed7 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddableUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddableUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedIdMappingComposite.java
index 36c01e5f31..a963cb1e49 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedIdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedIdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedIdMappingUiProvider.java
index 8d7faba5b8..f1d9f6c0f3 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedIdMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedMappingComposite.java
index 8e99e57ec0..70a91852d7 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.EmbeddedMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedMappingUiProvider.java
index a2b2150842..7f2663c5c4 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EmbeddedMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EmbeddedMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EntityUiProvider.java
index c0033b5358..a49d0b7d28 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0EntityUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0EntityUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0IdMappingComposite.java
index 977900a8f6..97030839c6 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0IdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0IdMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.IdMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0IdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0IdMappingUiProvider.java
index 45e8dde6d5..71ee969e31 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0IdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0IdMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToManyMappingComposite.java
index 74359ba09e..cf06cff577 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToManyMappingUiProvider.java
index 71fddd9729..68aca86d54 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToOneMappingComposite.java
index b88457f6ae..7637ee80bd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.ManyToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToOneMappingUiProvider.java
index f7bb078ab5..030893d8fe 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0ManyToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0ManyToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0MappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0MappedSuperclassUiProvider.java
index f20bf3ecc5..8be25d1266 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0MappedSuperclassUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0MappedSuperclassUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToManyMappingComposite.java
index fbb86d02f6..0bc9083118 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToManyMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToManyMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToManyMappingUiProvider.java
index 509adeefa0..8e6b86d7ea 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToManyMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToOneMappingComposite.java
index b4cbec8515..34aa727d9a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToOneMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.OneToOneMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToOneMappingUiProvider.java
index 0676ca7899..9ec15b07bc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0OneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0OneToOneMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0TransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0TransientMappingUiProvider.java
index 6438ab4077..9e00ea9271 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0TransientMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0TransientMappingUiProvider.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0VersionMappingComposite.java
index d3bb0014ab..8aa365a939 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0VersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0VersionMappingComposite.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.VersionMapping;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0VersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0VersionMappingUiProvider.java
index 5f229166b6..2977e62627 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/orm/details/Orm2_0VersionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/Orm2_0VersionMappingUiProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.orm.details;
+package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/platform/generic/Generic2_0JpaPlatformUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/platform/generic/Generic2_0JpaPlatformUiFactory.java
index 6dc1a133c4..7d4b0e8b83 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/platform/generic/Generic2_0JpaPlatformUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/platform/generic/Generic2_0JpaPlatformUiFactory.java
@@ -7,17 +7,17 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.platform.generic;
+package org.eclipse.jpt.ui.internal.jpa2.platform.generic;
 
 import org.eclipse.jpt.ui.JpaPlatformUi;
 import org.eclipse.jpt.ui.JpaPlatformUiFactory;
 import org.eclipse.jpt.ui.internal.GenericJpaPlatformUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.Generic2_0JpaPlatformUiProvider;
+import org.eclipse.jpt.ui.internal.jpa2.Generic2_0JpaUiFactory;
 import org.eclipse.jpt.ui.internal.platform.generic.GenericJpaPlatformUi;
 import org.eclipse.jpt.ui.internal.platform.generic.GenericNavigatorProvider;
 import org.eclipse.jpt.ui.internal.structure.JavaResourceModelStructureProvider;
 import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStructureProvider;
-import org.eclipse.jpt2_0.ui.internal.Generic2_0JpaPlatformUiProvider;
-import org.eclipse.jpt2_0.ui.internal.Generic2_0JpaUiFactory;
 
 public class Generic2_0JpaPlatformUiFactory implements JpaPlatformUiFactory
 {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/structure/Orm2_0ResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/structure/Orm2_0ResourceModelStructureProvider.java
index de93edfdbd..6168f45ca9 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/structure/Orm2_0ResourceModelStructureProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/structure/Orm2_0ResourceModelStructureProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.structure;
+package org.eclipse.jpt.ui.internal.jpa2.structure;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/structure/Persistence2_0ResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/structure/Persistence2_0ResourceModelStructureProvider.java
index 31603e65c2..11c54b7dcd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt2_0/ui/internal/structure/Persistence2_0ResourceModelStructureProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/structure/Persistence2_0ResourceModelStructureProvider.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.ui.internal.structure;
+package org.eclipse.jpt.ui.internal.jpa2.structure;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/META-INF/MANIFEST.MF b/jpa/tests/org.eclipse.jpt.core.tests/META-INF/MANIFEST.MF
index 313ab20ceb..1386015087 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/META-INF/MANIFEST.MF
+++ b/jpa/tests/org.eclipse.jpt.core.tests/META-INF/MANIFEST.MF
@@ -28,12 +28,12 @@ Export-Package: org.eclipse.jpt.core.tests.internal;x-friends:="org.eclipse.jpt.
  org.eclipse.jpt.core.tests.internal.context.java;x-internal:=true,
  org.eclipse.jpt.core.tests.internal.context.orm;x-internal:=true,
  org.eclipse.jpt.core.tests.internal.context.persistence;x-internal:=true,
+ org.eclipse.jpt.core.tests.internal.jpa2.context.java,
+ org.eclipse.jpt.core.tests.internal.jpa2.context.orm,
+ org.eclipse.jpt.core.tests.internal.jpa2.resource.java,
  org.eclipse.jpt.core.tests.internal.model;x-internal:=true,
  org.eclipse.jpt.core.tests.internal.platform;x-internal:=true,
  org.eclipse.jpt.core.tests.internal.projects;x-friends:="org.eclipse.jpt.ui.tests",
  org.eclipse.jpt.core.tests.internal.resource;x-internal:=true,
  org.eclipse.jpt.core.tests.internal.resource.java;x-internal:=true,
- org.eclipse.jpt.core.tests.internal.utility.jdt;x-internal:=true,
- org.eclipse.jpt2_0.core.tests.internal.context.java,
- org.eclipse.jpt2_0.core.tests.internal.context.orm,
- org.eclipse.jpt2_0.core.tests.internal.resource.java
+ org.eclipse.jpt.core.tests.internal.utility.jdt;x-internal:=true
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0ContextModelTestCase.java
index e29e649be5..9d69fb5770 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0ContextModelTestCase.java
@@ -8,12 +8,12 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.java;
 
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaPlatformProvider;
 import org.eclipse.jpt.core.tests.internal.context.ContextModelTestCase;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaPlatformProvider;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaContextModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaContextModelTests.java
index f569828914..db70ae5834 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaContextModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaContextModelTests.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.java;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java
index 7c8503f831..36e299e3c5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaPersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentAttributeTests.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.java;
 
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java
index 7bed521743..86d0dfcade 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaPersistentTypeTests.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.java;
 
 import java.util.Iterator;
 import java.util.ListIterator;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java
index 0305c4a7a1..ecdbfdd846 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/java/Generic2_0JavaSequenceGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/java/Generic2_0JavaSequenceGeneratorTests.java
@@ -7,7 +7,7 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.java;
 
 import java.util.Iterator;
 
@@ -19,14 +19,14 @@ import org.eclipse.jpt.core.context.IdMapping;
 import org.eclipse.jpt.core.context.SequenceGenerator;
 import org.eclipse.jpt.core.context.orm.OrmEntity;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.core.jpa2.context.SequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.persistence.PersistenceFactory;
 import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt2_0.core.context.SequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.resource.java.SequenceGenerator2_0Annotation;
 
 /**
  *  Generic2_0JavaSequenceGeneratorTests
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmContextModelTestCase.java
index be3a615578..60af040459 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmContextModelTestCase.java
@@ -7,18 +7,18 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.orm;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.orm;
 
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider;
+import org.eclipse.jpt.core.internal.jpa2.operations.Orm2_0FileCreationOperation;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaPlatformProvider;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperties;
 import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProvider;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlEntityMappings;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
+import org.eclipse.jpt.core.tests.internal.jpa2.context.java.Generic2_0ContextModelTestCase;
 import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
-import org.eclipse.jpt2_0.core.internal.operations.Orm2_0FileCreationOperation;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaPlatformProvider;
-import org.eclipse.jpt2_0.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt2_0.core.tests.internal.context.java.Generic2_0ContextModelTestCase;
 import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmContextModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmContextModelTests.java
index 6d15b0d6fb..1d19301179 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmContextModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmContextModelTests.java
@@ -8,7 +8,7 @@
  *  Contributors: 
  *  	Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.orm;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.orm;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java
index 48f538b8a9..99e56d3141 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmPersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentAttributeTests.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.orm;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.orm;
 
 import java.util.Iterator;
 import java.util.ListIterator;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java
index 477c69a7e7..e1f0b9d18a 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmPersistentTypeTests.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.orm;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.orm;
 
 import java.util.Iterator;
 import java.util.ListIterator;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmSequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java
index a0fe7c293a..c79ad4b2e1 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/context/orm/Generic2_0OrmSequenceGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/context/orm/Generic2_0OrmSequenceGeneratorTests.java
@@ -7,10 +7,10 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.context.orm;
+package org.eclipse.jpt.core.tests.internal.jpa2.context.orm;
 
-import org.eclipse.jpt2_0.core.context.SequenceGenerator2_0;
-import org.eclipse.jpt2_0.core.resource.orm.XmlSequenceGenerator;
+import org.eclipse.jpt.core.jpa2.context.SequenceGenerator2_0;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlSequenceGenerator;
 
 /**
  *  Generic2_0OrmSequenceGenerator2_0Tests
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AccessAnnotationTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AccessAnnotationTests.java
index 1314c7d60d..d476f79fdd 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AccessAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AccessAnnotationTests.java
@@ -7,16 +7,16 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt2_0.core.resource.java.AccessAnnotation;
 
 @SuppressWarnings("nls")
 public class AccessAnnotationTests extends Generic2_0JavaResourceModelTestCase {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AssociationOverride2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java
index 0b499a3639..fec9c096a0 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AssociationOverride2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverride2_0Tests.java
@@ -7,10 +7,11 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
@@ -18,7 +19,6 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt2_0.core.resource.java.AssociationOverride2_0Annotation;
 
 @SuppressWarnings("nls")
 public class AssociationOverride2_0Tests extends Generic2_0JavaResourceModelTestCase {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AssociationOverrides2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java
index 0b4e8fec03..e9d28929f5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/AssociationOverrides2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AssociationOverrides2_0Tests.java
@@ -7,11 +7,12 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import java.util.Iterator;
 
 import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jpt.core.jpa2.resource.java.AssociationOverride2_0Annotation;
 import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation;
 import org.eclipse.jpt.core.resource.java.AssociationOverridesAnnotation;
 import org.eclipse.jpt.core.resource.java.JPA;
@@ -22,7 +23,6 @@ import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.core.resource.java.NestableAnnotation;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt2_0.core.resource.java.AssociationOverride2_0Annotation;
 
 @SuppressWarnings("nls")
 public class AssociationOverrides2_0Tests extends Generic2_0JavaResourceModelTestCase {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/Generic2_0JavaResourceModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Generic2_0JavaResourceModelTestCase.java
index 2f8651df86..aafc4b3d82 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/Generic2_0JavaResourceModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Generic2_0JavaResourceModelTestCase.java
@@ -7,12 +7,12 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import org.eclipse.jpt.core.JpaAnnotationProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaAnnotationDefinitionProvider;
 import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider;
 import org.eclipse.jpt.core.tests.internal.resource.java.JavaResourceModelTestCase;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaAnnotationDefinitionProvider;
 
 public class Generic2_0JavaResourceModelTestCase extends JavaResourceModelTestCase
 {	
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/Generic2_0JavaResourceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Generic2_0JavaResourceTests.java
index bded6c3f96..f26fea8e96 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/Generic2_0JavaResourceTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Generic2_0JavaResourceTests.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/SequenceGenerator2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java
index 1eca5b622b..de5e80c3cd 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt2_0/core/tests/internal/resource/java/SequenceGenerator2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/SequenceGenerator2_0Tests.java
@@ -7,18 +7,18 @@
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
-package org.eclipse.jpt2_0.core.tests.internal.resource.java;
+package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import java.util.Iterator;
 
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider;
+import org.eclipse.jpt.core.internal.jpa2.platform.Generic2_0JpaAnnotationDefinitionProvider;
+import org.eclipse.jpt.core.jpa2.resource.java.SequenceGenerator2_0Annotation;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
-import org.eclipse.jpt2_0.core.internal.platform.Generic2_0JpaAnnotationDefinitionProvider;
-import org.eclipse.jpt2_0.core.resource.java.SequenceGenerator2_0Annotation;
 
 /**
  *  SequenceGenerator2_0Tests
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
index f02dac64d2..b48e0a7542 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/JptCoreResourceModelTests.java
@@ -13,8 +13,8 @@ package org.eclipse.jpt.core.tests.internal.resource;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import org.eclipse.jpt.core.tests.internal.jpa2.resource.java.Generic2_0JavaResourceTests;
 import org.eclipse.jpt.core.tests.internal.resource.java.JptJavaResourceTests;
-import org.eclipse.jpt2_0.core.tests.internal.resource.java.Generic2_0JavaResourceTests;
 
 public class JptCoreResourceModelTests extends TestCase
 {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1ContextModelTestCase.java
index 6df2674974..3c6236fa2f 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1ContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1ContextModelTestCase.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.eclipselink1_1.core.tests.internal.context;
 
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.jpt.eclipselink.core.tests.internal.context.EclipseLinkContextModelTestCase;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
index a19519ef48..05ce687906 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/EclipseLink1_1JpaProjectTests.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.internal.resource.orm.OrmXmlResourceProvider;
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.core.internal.resource.orm.EclipseLinkOrmXmlResourceProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.resource.orm.EclipseLink1_1OrmXmlResourceProvider;
 
 @SuppressWarnings("nls")
 public class EclipseLink1_1JpaProjectTests extends EclipseLink1_1ContextModelTestCase
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/JptEclipseLink1_1CoreContextModelTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/JptEclipseLink1_1CoreContextModelTests.java
index 4e1c4f8802..d78997861c 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/JptEclipseLink1_1CoreContextModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/JptEclipseLink1_1CoreContextModelTests.java
@@ -23,7 +23,7 @@ public class JptEclipseLink1_1CoreContextModelTests extends TestCase
 	public static Test suite(boolean all) {
 		TestSuite suite = new TestSuite(JptEclipseLink1_1CoreContextModelTests.class.getName());
 //		suite.addTestSuite(EclipseLink1_1JpaProjectTests.class);
-//		suite.addTest(JptEclipseLink1_1CoreOrmContextModelTests.suite(all));
+//		suite.addTest(JptEclipseLink1_1CoreOrmContextModelTests.suite());
 		return suite;
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmContextModelTestCase.java
index 306a55c541..f3d813defc 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmContextModelTestCase.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmContextModelTestCase.java
@@ -15,10 +15,10 @@ import org.eclipse.jpt.core.internal.operations.OrmFileCreationDataModelProperti
 import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
 import org.eclipse.jpt.core.tests.internal.projects.TestJpaProject;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.operations.EclipseLink1_1OrmFileCreationOperation;
 import org.eclipse.jpt.eclipselink.core.resource.orm.XmlEntityMappings;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.operations.EclipseLink1_1OrmFileCreationDataModelProvider;
-import org.eclipse.jpt.eclipselink1_1.core.internal.operations.EclipseLink1_1OrmFileCreationOperation;
 import org.eclipse.jpt.eclipselink1_1.core.tests.internal.context.EclipseLink1_1ContextModelTestCase;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java
index e9d343f809..e5bc1c7d78 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java
@@ -27,7 +27,7 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMapping;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentTypeTests.java
index b84ff48f39..4f03b1ccaf 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink1_1/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentTypeTests.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties;
 import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider;
 import org.eclipse.jpt.core.resource.java.JPA;
-import org.eclipse.jpt.eclipselink1_1.core.internal.EclipseLink1_1JpaPlatformProvider;
+import org.eclipse.jpt.eclipselink.core.internal.v1_1.EclipseLink1_1JpaPlatformProvider;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
author	kmoore	2009-07-17 16:15:02 +0000
committer	kmoore	2009-07-17 16:15:02 +0000
commit	2871f140476c9e2d586f73ad203fcf0d3aab963c (patch)
tree	f5ee4d77d7ab19e5706404cad01d2e81eb85833e /jpa
parent	129fed1962f7f450f3c1f1257a7c38088c8fd7e1 (diff)
download	webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.tar.gz webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.tar.xz webtools.dali-2871f140476c9e2d586f73ad203fcf0d3aab963c.zip