30 files changed, 49 insertions, 49 deletions
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;