more renames - eclipselink Core and UI

119 files changed, 964 insertions, 964 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
index f6600f06b2..7ac94f7743 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/EclipseLinkJpaUiFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.context.java.JavaOneToManyMapping;
 import org.eclipse.jpt.core.context.java.JavaOneToOneMapping;
 import org.eclipse.jpt.core.context.java.JavaVersionMapping;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaOneToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkOneToManyMapping;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.caching.Caching;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.connection.Connection;
@@ -30,9 +30,9 @@ import org.eclipse.jpt.eclipselink.core.internal.context.persistence.customizati
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.logging.Logging;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.options.Options;
 import org.eclipse.jpt.eclipselink.core.internal.context.persistence.schema.generation.SchemaGeneration;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaEmbeddableComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaEntityComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaMappedSuperclassComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkEmbeddableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkEntityComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkMappedSuperclassComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkIdMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToManyMappingComposite;
@@ -184,21 +184,21 @@ public class EclipseLinkJpaUiFactory extends BaseJpaUiFactory
 	public JpaComposite createJavaMappedSuperclassComposite(
 			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkJavaMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
 	}
 	
 	@Override
 	public JpaComposite createJavaEntityComposite(
 			PropertyValueModel<JavaEntity> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkJavaEntityComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory);
 	}
 	
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
 			PropertyValueModel<JavaEmbeddable> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkJavaEmbeddableComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory);
 	}
 	
 	
@@ -241,7 +241,7 @@ public class EclipseLinkJpaUiFactory extends BaseJpaUiFactory
 			PropertyValueModel<? extends JavaOneToManyMapping> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOneToManyMappingComposite((PropertyValueModel<EclipseLinkJavaOneToManyMapping>) subjectHolder, parent, widgetFactory);
+		return new EclipseLinkOneToManyMappingComposite((PropertyValueModel<JavaEclipseLinkOneToManyMapping>) subjectHolder, parent, widgetFactory);
 	}
 	
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultOneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkOneToManyMappingUiProvider.java
index bbf6cc066e..434afb850b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultOneToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkOneToManyMappingUiProvider.java
@@ -24,13 +24,13 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
-public class DefaultOneToManyMappingUiProvider
+public class DefaultJavaEclipseLinkOneToManyMappingUiProvider
 	extends AbstractOneToManyMappingUiProvider<JavaOneToManyMapping>
 	implements DefaultAttributeMappingUiProvider<JavaOneToManyMapping>
 {
 	// singleton
-	private static final DefaultOneToManyMappingUiProvider INSTANCE = 
-		new DefaultOneToManyMappingUiProvider();
+	private static final DefaultJavaEclipseLinkOneToManyMappingUiProvider INSTANCE = 
+		new DefaultJavaEclipseLinkOneToManyMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -43,7 +43,7 @@ public class DefaultOneToManyMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private DefaultOneToManyMappingUiProvider() {
+	private DefaultJavaEclipseLinkOneToManyMappingUiProvider() {
 		super();
 	}
 		
@@ -62,12 +62,12 @@ public class DefaultOneToManyMappingUiProvider
 	
 	@Override
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultOneToManyMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_label;
 	}
 
 	@Override
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultOneToManyMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_linkLabel;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkOneToOneMappingUiProvider.java
index 80f2140730..889e525ba9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkOneToOneMappingUiProvider.java
@@ -24,13 +24,13 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
-public class DefaultOneToOneMappingUiProvider
+public class DefaultJavaEclipseLinkOneToOneMappingUiProvider
 	extends AbstractOneToOneMappingUiProvider<JavaOneToOneMapping>
 	implements DefaultAttributeMappingUiProvider<JavaOneToOneMapping>
 {
 	// singleton
-	private static final DefaultOneToOneMappingUiProvider INSTANCE = 
-		new DefaultOneToOneMappingUiProvider();
+	private static final DefaultJavaEclipseLinkOneToOneMappingUiProvider INSTANCE = 
+		new DefaultJavaEclipseLinkOneToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -43,7 +43,7 @@ public class DefaultOneToOneMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private DefaultOneToOneMappingUiProvider() {
+	private DefaultJavaEclipseLinkOneToOneMappingUiProvider() {
 		super();
 	}
 		
@@ -62,12 +62,12 @@ public class DefaultOneToOneMappingUiProvider
 	
 	@Override
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultOneToOneMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_label;
 	}
 
 	@Override
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultOneToOneMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_linkLabel;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultEclipseLinkVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider.java
index d73b3578a6..035d359cf5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultEclipseLinkVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider.java
@@ -12,9 +12,9 @@ package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys;
-import org.eclipse.jpt.eclipselink.core.internal.context.java.EclipseLinkJavaVariableOneToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkVariableOneToOneMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.VariableOneToOneMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.JptUiPlugin;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -25,17 +25,17 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
 
-public class DefaultEclipseLinkVariableOneToOneMappingUiProvider
-	implements DefaultAttributeMappingUiProvider<EclipseLinkJavaVariableOneToOneMapping>
+public class DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider
+	implements DefaultAttributeMappingUiProvider<JavaEclipseLinkVariableOneToOneMapping>
 {
 	// singleton
-	private static final DefaultEclipseLinkVariableOneToOneMappingUiProvider INSTANCE = 
-		new DefaultEclipseLinkVariableOneToOneMappingUiProvider();
+	private static final DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider INSTANCE = 
+		new DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static DefaultAttributeMappingUiProvider<EclipseLinkJavaVariableOneToOneMapping> instance() {
+	public static DefaultAttributeMappingUiProvider<JavaEclipseLinkVariableOneToOneMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -43,7 +43,7 @@ public class DefaultEclipseLinkVariableOneToOneMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private DefaultEclipseLinkVariableOneToOneMappingUiProvider() {
+	private DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider() {
 		super();
 	}
 	
@@ -64,18 +64,18 @@ public class DefaultEclipseLinkVariableOneToOneMappingUiProvider
 	}
 	
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultVariableOneToOneMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkVariableOneToOneMappingUiProvider_label;
 	}
 
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.DefaultVariableOneToOneMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.DefaultEclipseLinkVariableOneToOneMappingUiProvider_linkLabel;
 	}
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkJavaVariableOneToOneMapping> subjectHolder,
+			PropertyValueModel<JavaEclipseLinkVariableOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new VariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
 	}	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaBasicCollectionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkBasicCollectionMappingUiProvider.java
index 7e2e4b1f05..bfd0124384 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaBasicCollectionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkBasicCollectionMappingUiProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicCollectionMapping;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.BasicCollectionMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicCollectionMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicCollectionMappingUiProvider;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkJavaBasicCollectionMappingUiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
+public class JavaEclipseLinkBasicCollectionMappingUiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
 {
 	// singleton
-	private static final EclipseLinkJavaBasicCollectionMappingUiProvider INSTANCE = 
-		new EclipseLinkJavaBasicCollectionMappingUiProvider();
+	private static final JavaEclipseLinkBasicCollectionMappingUiProvider INSTANCE = 
+		new JavaEclipseLinkBasicCollectionMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkJavaBasicCollectionMappingUiProvider extends EclipseLink
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkJavaBasicCollectionMappingUiProvider() {
+	private JavaEclipseLinkBasicCollectionMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkJavaBasicCollectionMappingUiProvider extends EclipseLink
 			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new BasicCollectionMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaBasicMapMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkBasicMapMappingUiProvider.java
index 16a11499f4..e4b91b60a6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaBasicMapMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkBasicMapMappingUiProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapMapping;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.BasicMapMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMapMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMapMappingUiProvider;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkJavaBasicMapMappingUiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
+public class JavaEclipseLinkBasicMapMappingUiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
 {
 	// singleton
-	private static final EclipseLinkJavaBasicMapMappingUiProvider INSTANCE = 
-		new EclipseLinkJavaBasicMapMappingUiProvider();
+	private static final JavaEclipseLinkBasicMapMappingUiProvider INSTANCE = 
+		new JavaEclipseLinkBasicMapMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkJavaBasicMapMappingUiProvider extends EclipseLinkBasicMa
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkJavaBasicMapMappingUiProvider() {
+	private JavaEclipseLinkBasicMapMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkJavaBasicMapMappingUiProvider extends EclipseLinkBasicMa
 			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new BasicMapMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkBasicMapMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaCachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkCachingComposite.java
index f3db39a73f..da38de824b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkCachingComposite.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.CachingComposite;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkCachingComposite;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
@@ -35,21 +35,21 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @see Entity
  * @see EclipseLinkCaching
- * @see EclipseLinkJavaEntityComposite - The parent container
- * @see CacheTypeComposite
- * @see CacheSizeComposite
- * @see AlwaysRefreshComposite
- * @see RefreshOnlyIfNewerComposite
- * @see DisableHitsComposite
+ * @see JavaEclipseLinkEntityComposite - The parent container
+ * @see EclipseLinkCacheTypeComposite
+ * @see EclipseLinkCacheSizeComposite
+ * @see EclipseLinkAlwaysRefreshComposite
+ * @see EclipseLinkRefreshOnlyIfNewerComposite
+ * @see EclipseLinkDisableHitsComposite
  *
  * @version 2.1
  * @since 2.1
  */
-public class JavaCachingComposite extends CachingComposite<EclipseLinkJavaCaching>
+public class JavaEclipseLinkCachingComposite extends EclipseLinkCachingComposite<JavaEclipseLinkCaching>
 {
 
-	public JavaCachingComposite(FormPane<?> parentPane,
-        PropertyValueModel<EclipseLinkJavaCaching> subjectHolder,
+	public JavaEclipseLinkCachingComposite(FormPane<?> parentPane,
+        PropertyValueModel<JavaEclipseLinkCaching> subjectHolder,
         Composite parent) {
 
 		super(parentPane, subjectHolder, parent);
@@ -57,6 +57,6 @@ public class JavaCachingComposite extends CachingComposite<EclipseLinkJavaCachin
 
 	@Override
 	protected void initializeExistenceCheckingComposite(Composite parent) {
-		new JavaExistenceCheckingComposite(this, parent);
+		new JavaEclipseLinkExistenceCheckingComposite(this, parent);
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/ConvertersComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkConvertersComposite.java
index 109a531cd9..63b8d36c3b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/ConvertersComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkConvertersComposite.java
@@ -13,12 +13,12 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCustomConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkStructConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.CustomConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.ObjectTypeConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.StructConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.TypeConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkCustomConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkObjectTypeConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkStructConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTypeConverterComposite;
 import org.eclipse.jpt.ui.internal.widgets.Pane;
 import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -67,7 +67,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
+public class JavaEclipseLinkConvertersComposite extends Pane<JavaEclipseLinkConverterHolder>
 {
 
 	/**
@@ -76,8 +76,8 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ConvertersComposite(Pane<?> parentPane,
-								PropertyValueModel<? extends EclipseLinkJavaConverterHolder> subjectHolder,
+	public JavaEclipseLinkConvertersComposite(Pane<?> parentPane,
+								PropertyValueModel<? extends JavaEclipseLinkConverterHolder> subjectHolder,
 								Composite parent) {
 
 		super(parentPane, subjectHolder, parent, false);
@@ -93,13 +93,13 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 		// Custom Converter check box
 		Button customConverterCheckBox = addCheckBox(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_customConverter,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_customConverter,
 			buildCustomConverterBooleanHolder(),
 			null
 		);
 
 		// Custom Converter pane
-		CustomConverterComposite customConverterComposite = new CustomConverterComposite(
+		EclipseLinkCustomConverterComposite customConverterComposite = new EclipseLinkCustomConverterComposite(
 			buildCustomConverterHolder(),
 			addSubPane(container, 0, customConverterCheckBox.getBorderWidth() + 16),
 			getWidgetFactory()
@@ -110,13 +110,13 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 		// Type Converter check box
 		Button typeConverterCheckBox = addCheckBox(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_typeConverter,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_typeConverter,
 			buildTypeConverterBooleanHolder(),
 			null
 		);
 
 		// Type Converter pane
-		TypeConverterComposite typeConverterComposite = new TypeConverterComposite(
+		EclipseLinkTypeConverterComposite typeConverterComposite = new EclipseLinkTypeConverterComposite(
 			buildTypeConverterHolder(),
 			addSubPane(container, 0, typeConverterCheckBox.getBorderWidth() + 16),
 			getWidgetFactory()
@@ -126,13 +126,13 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 		// Object Type Converter check box
 		Button objectTypeConverterCheckBox = addCheckBox(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_objectTypeConverter,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_objectTypeConverter,
 			buildObjectTypeConverterBooleanHolder(),
 			null
 		);
 
 		// Object Type Converter pane
-		ObjectTypeConverterComposite objectTypeConverterComposite = new ObjectTypeConverterComposite(
+		EclipseLinkObjectTypeConverterComposite objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(
 			buildObjectTypeConverterHolder(),
 			addSubPane(container, 0, objectTypeConverterCheckBox.getBorderWidth() + 16),
 			getWidgetFactory()
@@ -142,13 +142,13 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 		// Struct Converter check box
 		Button structConverterCheckBox = addCheckBox(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_structConverter,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_structConverter,
 			buildStructConverterBooleanHolder(),
 			null
 		);
 
 		// Struct Converter pane
-		StructConverterComposite structConverterComposite = new StructConverterComposite(
+		EclipseLinkStructConverterComposite structConverterComposite = new EclipseLinkStructConverterComposite(
 			buildStructConverterHolder(),
 			addSubPane(container, 0, structConverterCheckBox.getBorderWidth() + 16),
 			getWidgetFactory()
@@ -157,7 +157,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildCustomConverterBooleanHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, Boolean>(getSubjectHolder(), EclipseLinkJavaConverterHolder.CUSTOM_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, Boolean>(getSubjectHolder(), JavaEclipseLinkConverterHolder.CUSTOM_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getCustomConverter() != null);
@@ -176,7 +176,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private PropertyValueModel<EclipseLinkCustomConverter> buildCustomConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, EclipseLinkCustomConverter>(getSubjectHolder(), EclipseLinkJavaConverterHolder.CUSTOM_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, EclipseLinkCustomConverter>(getSubjectHolder(), JavaEclipseLinkConverterHolder.CUSTOM_CONVERTER_PROPERTY) {
 			@Override
 			protected EclipseLinkCustomConverter buildValue_() {
 				return this.subject.getCustomConverter();
@@ -185,7 +185,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildTypeConverterBooleanHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, Boolean>(getSubjectHolder(), EclipseLinkJavaConverterHolder.TYPE_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, Boolean>(getSubjectHolder(), JavaEclipseLinkConverterHolder.TYPE_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getTypeConverter() != null);
@@ -204,7 +204,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private PropertyValueModel<EclipseLinkTypeConverter> buildTypeConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, EclipseLinkTypeConverter>(getSubjectHolder(), EclipseLinkJavaConverterHolder.TYPE_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, EclipseLinkTypeConverter>(getSubjectHolder(), JavaEclipseLinkConverterHolder.TYPE_CONVERTER_PROPERTY) {
 			@Override
 			protected EclipseLinkTypeConverter buildValue_() {
 				return this.subject.getTypeConverter();
@@ -213,7 +213,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildObjectTypeConverterBooleanHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, Boolean>(getSubjectHolder(), EclipseLinkJavaConverterHolder.OBJECT_TYPE_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, Boolean>(getSubjectHolder(), JavaEclipseLinkConverterHolder.OBJECT_TYPE_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getObjectTypeConverter() != null);
@@ -232,7 +232,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private PropertyValueModel<EclipseLinkObjectTypeConverter> buildObjectTypeConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, EclipseLinkObjectTypeConverter>(getSubjectHolder(), EclipseLinkJavaConverterHolder.OBJECT_TYPE_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, EclipseLinkObjectTypeConverter>(getSubjectHolder(), JavaEclipseLinkConverterHolder.OBJECT_TYPE_CONVERTER_PROPERTY) {
 			@Override
 			protected EclipseLinkObjectTypeConverter buildValue_() {
 				return this.subject.getObjectTypeConverter();
@@ -242,7 +242,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	
 	
 	private WritablePropertyValueModel<Boolean> buildStructConverterBooleanHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, Boolean>(getSubjectHolder(), EclipseLinkJavaConverterHolder.STRUCT_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, Boolean>(getSubjectHolder(), JavaEclipseLinkConverterHolder.STRUCT_CONVERTER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getStructConverter() != null);
@@ -261,7 +261,7 @@ public class ConvertersComposite extends Pane<EclipseLinkJavaConverterHolder>
 	}
 	
 	private PropertyValueModel<EclipseLinkStructConverter> buildStructConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaConverterHolder, EclipseLinkStructConverter>(getSubjectHolder(), EclipseLinkJavaConverterHolder.STRUCT_CONVERTER_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkConverterHolder, EclipseLinkStructConverter>(getSubjectHolder(), JavaEclipseLinkConverterHolder.STRUCT_CONVERTER_PROPERTY) {
 			@Override
 			protected EclipseLinkStructConverter buildValue_() {
 				return this.subject.getStructConverter();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkEmbeddableComposite.java
index b44cd18b4d..7deda6f9b2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkEmbeddableComposite.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 
 import org.eclipse.jpt.core.context.java.JavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEmbeddableAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkJavaEmbeddableComposite extends FormPane<JavaEmbeddable>
+public class JavaEclipseLinkEmbeddableComposite extends FormPane<JavaEmbeddable>
                                  implements JpaComposite
 {
 	/**
@@ -41,7 +41,7 @@ public class EclipseLinkJavaEmbeddableComposite extends FormPane<JavaEmbeddable>
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkJavaEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
+	public JavaEclipseLinkEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -61,14 +61,14 @@ public class EclipseLinkJavaEmbeddableComposite extends FormPane<JavaEmbeddable>
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaEmbeddable, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaEmbeddable, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaEmbeddable) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkEmbeddable) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkEntityComposite.java
index 3b9a1ceade..1f043ed69d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkEntityComposite.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 
 import org.eclipse.jpt.core.context.java.JavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkEntity;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEntityAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -26,13 +26,13 @@ import org.eclipse.swt.widgets.Composite;
 /**
  * The pane used for an EclipseLink Java entity.
  *
- * @see EclipseLinkJavaEntity
+ * @see JavaEclipseLinkEntity
  * @see EclipselinkJpaUiFactory - The factory creating this pane
  *
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<JavaEntity>
+public class JavaEclipseLinkEntityComposite extends AbstractEntityComposite<JavaEntity>
 {
 	/**
 	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
@@ -41,7 +41,7 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkJavaEntityComposite(PropertyValueModel<? extends JavaEntity> subjectHolder,
+	public JavaEclipseLinkEntityComposite(PropertyValueModel<? extends JavaEntity> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -69,16 +69,16 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching
 		);
 
-		new JavaCachingComposite(this, buildCachingHolder(), container);
+		new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<JavaEntity, EclipseLinkJavaCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<JavaEntity, EclipseLinkJavaCaching>(
+	private PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching> buildCachingHolder() {
+		return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkJavaCaching buildValue_() {
-				return ((EclipseLinkJavaEntity) this.subject).getCaching();
+			protected JavaEclipseLinkCaching buildValue_() {
+				return ((JavaEclipseLinkEntity) this.subject).getCaching();
 			}
 		};
 		
@@ -91,14 +91,14 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaEntity, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaEntity) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkEntity) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaExistenceCheckingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkExistenceCheckingComposite.java
index edcb29be2b..03995575d5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaExistenceCheckingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkExistenceCheckingComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 import java.util.Collection;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkExistenceType;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class JavaExistenceCheckingComposite extends FormPane<EclipseLinkJavaCaching> {
+public class JavaEclipseLinkExistenceCheckingComposite extends FormPane<JavaEclipseLinkCaching> {
 
 	/**
 	 * Creates a new <code>ExistenceCheckingComposite</code>.
@@ -42,7 +42,7 @@ public class JavaExistenceCheckingComposite extends FormPane<EclipseLinkJavaCach
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public JavaExistenceCheckingComposite(FormPane<? extends EclipseLinkJavaCaching> parentPane,
+	public JavaEclipseLinkExistenceCheckingComposite(FormPane<? extends JavaEclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent, false);
@@ -55,7 +55,7 @@ public class JavaExistenceCheckingComposite extends FormPane<EclipseLinkJavaCach
             container, 
             addCheckBox( 
                  container, 
-                 EclipseLinkUiMappingsMessages.ExistenceCheckingComposite_label, 
+                 EclipseLinkUiMappingsMessages.EclipseLinkExistenceCheckingComposite_label, 
                  buildExistenceCheckingHolder(), 
                  null 
             ), 
@@ -89,7 +89,7 @@ public class JavaExistenceCheckingComposite extends FormPane<EclipseLinkJavaCach
 			protected String displayString(EclipseLinkExistenceType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					JavaExistenceCheckingComposite.this,
+					JavaEclipseLinkExistenceCheckingComposite.this,
 					value
 				);
 			}
@@ -112,7 +112,7 @@ public class JavaExistenceCheckingComposite extends FormPane<EclipseLinkJavaCach
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildExistenceCheckingHolder() {
-		return new PropertyAspectAdapter<EclipseLinkJavaCaching, Boolean>(getSubjectHolder(), EclipseLinkJavaCaching.EXISTENCE_CHECKING_PROPERTY) {
+		return new PropertyAspectAdapter<JavaEclipseLinkCaching, Boolean>(getSubjectHolder(), JavaEclipseLinkCaching.EXISTENCE_CHECKING_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.hasExistenceChecking());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkMappedSuperclassComposite.java
index b6c6f8ea67..4c04f341a5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkMappedSuperclassComposite.java
@@ -10,9 +10,9 @@
 package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMappedSuperclassAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkJavaMappedSuperclassComposite extends FormPane<JavaMappedSuperclass>
+public class JavaEclipseLinkMappedSuperclassComposite extends FormPane<JavaMappedSuperclass>
                                        implements JpaComposite
 {
 	/**
@@ -42,7 +42,7 @@ public class EclipseLinkJavaMappedSuperclassComposite extends FormPane<JavaMappe
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkJavaMappedSuperclassComposite(PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
+	public JavaEclipseLinkMappedSuperclassComposite(PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
@@ -65,16 +65,16 @@ public class EclipseLinkJavaMappedSuperclassComposite extends FormPane<JavaMappe
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching
 		);
 
-		new JavaCachingComposite(this, buildCachingHolder(), container);
+		new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaCaching>(
+	private PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching> buildCachingHolder() {
+		return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkJavaCaching buildValue_() {
-				return ((EclipseLinkJavaMappedSuperclass) this.subject).getCaching();
+			protected JavaEclipseLinkCaching buildValue_() {
+				return ((JavaEclipseLinkMappedSuperclass) this.subject).getCaching();
 			}
 		};
 	}
@@ -85,14 +85,14 @@ public class EclipseLinkJavaMappedSuperclassComposite extends FormPane<JavaMappe
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaMappedSuperclass) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkMappedSuperclass) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaTransformationMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkTransformationMappingUiProvider.java
index 4e2d814d30..181c9e28bb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaTransformationMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkTransformationMappingUiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTransformationMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.TransformationMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkJavaTransformationMappingUiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
+public class JavaEclipseLinkTransformationMappingUiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
 {
 	// singleton
-	private static final EclipseLinkJavaTransformationMappingUiProvider INSTANCE = 
-		new EclipseLinkJavaTransformationMappingUiProvider();
+	private static final JavaEclipseLinkTransformationMappingUiProvider INSTANCE = 
+		new JavaEclipseLinkTransformationMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkJavaTransformationMappingUiProvider extends EclipseLinkT
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkJavaTransformationMappingUiProvider() {
+	private JavaEclipseLinkTransformationMappingUiProvider() {
 		super();
 	}
 	
@@ -52,6 +52,6 @@ public class EclipseLinkJavaTransformationMappingUiProvider extends EclipseLinkT
 		Composite parent,
 		WidgetFactory widgetFactory) {
 		
-		return new TransformationMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkTransformationMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkVariableOneToOneMappingUiProvider.java
index a9bf0ee005..7e499f9204 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/JavaEclipseLinkVariableOneToOneMappingUiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.core.JptCorePlugin;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVariableOneToOneMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.VariableOneToOneMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkJavaVariableOneToOneMappingUiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
+public class JavaEclipseLinkVariableOneToOneMappingUiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkJavaVariableOneToOneMappingUiProvider INSTANCE = 
-		new EclipseLinkJavaVariableOneToOneMappingUiProvider();
+	private static final JavaEclipseLinkVariableOneToOneMappingUiProvider INSTANCE = 
+		new JavaEclipseLinkVariableOneToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkJavaVariableOneToOneMappingUiProvider extends EclipseLin
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkJavaVariableOneToOneMappingUiProvider() {
+	private JavaEclipseLinkVariableOneToOneMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkJavaVariableOneToOneMappingUiProvider extends EclipseLin
 			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new VariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/EclipseLinkUiMappingsMessages.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/EclipseLinkUiMappingsMessages.java
index e441151167..6864f4c827 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/EclipseLinkUiMappingsMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/EclipseLinkUiMappingsMessages.java
@@ -20,137 +20,137 @@ import org.eclipse.osgi.util.NLS;
 @SuppressWarnings("nls")
 public class EclipseLinkUiMappingsMessages extends NLS {
 
-	public static String BasicCollectionMappingUiProvider_label;
-	public static String BasicCollectionMappingUiProvider_linkLabel;
+	public static String EclipseLinkBasicCollectionMappingUiProvider_label;
+	public static String EclipseLinkBasicCollectionMappingUiProvider_linkLabel;
 	
-	public static String BasicMapMappingUiProvider_label;
-	public static String BasicMapMappingUiProvider_linkLabel;
+	public static String EclipseLinkBasicMapMappingUiProvider_label;
+	public static String EclipseLinkBasicMapMappingUiProvider_linkLabel;
 	
-	public static String TransformationMappingUiProvider_label;
-	public static String TransformationMappingUiProvider_linkLabel;
+	public static String EclipseLinkTransformationMappingUiProvider_label;
+	public static String EclipseLinkTransformationMappingUiProvider_linkLabel;
 
-	public static String VariableOneToOneMappingUiProvider_label;
-	public static String VariableOneToOneMappingUiProvider_linkLabel;
+	public static String EclipseLinkVariableOneToOneMappingUiProvider_label;
+	public static String EclipseLinkVariableOneToOneMappingUiProvider_linkLabel;
 
-	public static String CacheTypeComposite_label;
-	public static String CacheTypeComposite_full;
-	public static String CacheTypeComposite_weak;
-	public static String CacheTypeComposite_soft;
-	public static String CacheTypeComposite_soft_weak;
-	public static String CacheTypeComposite_hard_weak;
-	public static String CacheTypeComposite_cache;
-	public static String CacheTypeComposite_none;
+	public static String EclipseLinkCacheTypeComposite_label;
+	public static String EclipseLinkCacheTypeComposite_full;
+	public static String EclipseLinkCacheTypeComposite_weak;
+	public static String EclipseLinkCacheTypeComposite_soft;
+	public static String EclipseLinkCacheTypeComposite_soft_weak;
+	public static String EclipseLinkCacheTypeComposite_hard_weak;
+	public static String EclipseLinkCacheTypeComposite_cache;
+	public static String EclipseLinkCacheTypeComposite_none;
 	public static String EclipseLinkTypeMappingComposite_advanced;
 	public static String EclipseLinkTypeMappingComposite_caching;
 	public static String EclipseLinkTypeMappingComposite_converters;
 	
-	public static String CacheSizeComposite_size;
-	public static String CacheCoordinationTypeComposite_label;
-	public static String CacheCoordinationTypeComposite_send_object_changes;
-	public static String CacheCoordinationTypeComposite_invalidate_changed_objects;
-	public static String CacheCoordinationTypeComposite_send_new_objects_with_changes;
-	public static String CacheCoordinationTypeComposite_none;
+	public static String EclipseLinkCacheSizeComposite_size;
+	public static String EclipseLinkCacheCoordinationTypeComposite_label;
+	public static String EclipseLinkCacheCoordinationTypeComposite_send_object_changes;
+	public static String EclipseLinkCacheCoordinationTypeComposite_invalidate_changed_objects;
+	public static String EclipseLinkCacheCoordinationTypeComposite_send_new_objects_with_changes;
+	public static String EclipseLinkCacheCoordinationTypeComposite_none;
 
-	public static String CachingComposite_sharedLabelDefault;
-	public static String CachingComposite_sharedLabel;
-	public static String CachingComposite_advanced;
-	public static String AlwaysRefreshComposite_alwaysRefreshDefault;
-	public static String AlwaysRefreshComposite_alwaysRefreshLabel;
-	public static String RefreshOnlyIfNewerComposite_refreshOnlyIfNewerDefault;
-	public static String RefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel;
-	public static String DisableHitsComposite_disableHitsDefault;
-	public static String DisableHitsComposite_disableHitsLabel;
-	
-	public static String ChangeTrackingComposite_label;
-	public static String ChangeTrackingComposite_attribute;
-	public static String ChangeTrackingComposite_object;
-	public static String ChangeTrackingComposite_deferred;
-	public static String ChangeTrackingComposite_auto;
-	
-	public static String ConvertComposite_converterNameLabel;
-	public static String ConvertComposite_defineConverterSection;
-	public static String ConvertComposite_default;
-	public static String ConvertComposite_custom;
-	public static String ConvertComposite_type;
-	public static String ConvertComposite_objectType;
-	public static String ConvertComposite_struct;
-	
-	public static String ConverterComposite_nameTextLabel;
-	public static String ConverterComposite_classLabel;
+	public static String EclipseLinkCachingComposite_sharedLabelDefault;
+	public static String EclipseLinkCachingComposite_sharedLabel;
+	public static String EclipseLinkCachingComposite_advanced;
+	public static String EclipseLinkAlwaysRefreshComposite_alwaysRefreshDefault;
+	public static String EclipseLinkAlwaysRefreshComposite_alwaysRefreshLabel;
+	public static String EclipseLinkRefreshOnlyIfNewerComposite_refreshOnlyIfNewerDefault;
+	public static String EclipseLinkRefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel;
+	public static String EclipseLinkDisableHitsComposite_disableHitsDefault;
+	public static String EclipseLinkDisableHitsComposite_disableHitsLabel;
+	
+	public static String EclipseLinkChangeTrackingComposite_label;
+	public static String EclipseLinkChangeTrackingComposite_attribute;
+	public static String EclipseLinkChangeTrackingComposite_object;
+	public static String EclipseLinkChangeTrackingComposite_deferred;
+	public static String EclipseLinkChangeTrackingComposite_auto;
+	
+	public static String EclipseLinkConvertComposite_converterNameLabel;
+	public static String EclipseLinkConvertComposite_defineConverterSection;
+	public static String EclipseLinkConvertComposite_default;
+	public static String EclipseLinkConvertComposite_custom;
+	public static String EclipseLinkConvertComposite_type;
+	public static String EclipseLinkConvertComposite_objectType;
+	public static String EclipseLinkConvertComposite_struct;
+	
+	public static String EclipseLinkConverterComposite_nameTextLabel;
+	public static String EclipseLinkConverterComposite_classLabel;
 
-	public static String ConvertersComposite_customConverter;
-	public static String ConvertersComposite_objectTypeConverter;
-	public static String ConvertersComposite_structConverter;
-	public static String ConvertersComposite_typeConverter;
+	public static String EclipseLinkConvertersComposite_customConverter;
+	public static String EclipseLinkConvertersComposite_objectTypeConverter;
+	public static String EclipseLinkConvertersComposite_structConverter;
+	public static String EclipseLinkConvertersComposite_typeConverter;
 	
-	public static String CustomizerComposite_classLabel;
+	public static String EclipseLinkCustomizerComposite_classLabel;
 		
 	public static String TypeSection_converted;
 	
-	public static String ExistenceCheckingComposite_label;
-	public static String JavaExistenceCheckingComposite_check_cache;
-	public static String JavaExistenceCheckingComposite_check_database;
-	public static String JavaExistenceCheckingComposite_assume_existence;
-	public static String JavaExistenceCheckingComposite_assume_non_existence;
-	public static String OrmExistenceCheckingComposite_check_cache;
-	public static String OrmExistenceCheckingComposite_check_database;
-	public static String OrmExistenceCheckingComposite_assume_existence;
-	public static String OrmExistenceCheckingComposite_assume_non_existence;
-	
-	public static String ExpiryComposite_expirySection;
-	public static String ExpiryComposite_noExpiry;
-	public static String ExpiryComposite_timeToLiveExpiry;
-	public static String ExpiryComposite_timeToLiveExpiryExpireAfter;
-	public static String ExpiryComposite_timeToLiveExpiryMilliseconds;
-	public static String ExpiryComposite_dailyExpiry;
-	public static String ExpiryComposite_timeOfDayExpiryExpireAt;
-	
-	public static String JoinFetchComposite_label;
-	public static String JoinFetchComposite_inner;
-	public static String JoinFetchComposite_outer;	
-	
-	public static String MutableComposite_mutableLabel;
-	public static String MutableComposite_mutableLabelDefault;
-	public static String MutableComposite_true;
-	public static String MutableComposite_false;
-	
-	public static String ObjectTypeConverterComposite_dataTypeLabel;
-	public static String ObjectTypeConverterComposite_objectTypeLabel;
-	public static String ObjectTypeConverterComposite_conversionValueEdit;
-	public static String ObjectTypeConverterComposite_conversionValuesDataValueColumn;
-	public static String ObjectTypeConverterComposite_conversionValuesObjectValueColumn;
-	public static String ObjectTypeConverterComposite_defaultObjectValueLabel;
-	public static String ObjectTypeConverterComposite_conversionValuesGroupTitle;
-	
-	public static String ConversionValueDialog_addConversionValue;
-	public static String ConversionValueDialog_editConversionValue;
-	public static String ConversionValueDialog_addConversionValueDescriptionTitle;
-	public static String ConversionValueDialog_editConversionValueDescriptionTitle;
-	public static String ConversionValueDialog_addConversionValueDescription;
-	public static String ConversionValueDialog_editConversionValueDescription;
-	
-	public static String ConversionValueDialog_dataValue;
-	public static String ConversionValueDialog_objectValue;
-	public static String ConversionValueStateObject_dataValueMustBeSpecified;
-	public static String ConversionValueStateObject_objectValueMustBeSpecified;
-	public static String ConversionValueStateObject_dataValueAlreadyExists;
-	
-	public static String PrivateOwnedComposite_privateOwnedLabel;
-	
-	public static String ReadOnlyComposite_readOnlyLabel;
-	public static String ReadOnlyComposite_readOnlyWithDefault;
-	
-	public static String TypeConverterComposite_dataTypeLabel;
-	public static String TypeConverterComposite_objectTypeLabel;
+	public static String EclipseLinkExistenceCheckingComposite_label;
+	public static String JavaEclipseLinkExistenceCheckingComposite_check_cache;
+	public static String JavaEclipseLinkExistenceCheckingComposite_check_database;
+	public static String JavaEclipseLinkExistenceCheckingComposite_assume_existence;
+	public static String JavaEclipseLinkExistenceCheckingComposite_assume_non_existence;
+	public static String OrmEclipseLinkExistenceCheckingComposite_check_cache;
+	public static String OrmEclipseLinkExistenceCheckingComposite_check_database;
+	public static String OrmEclipseLinkExistenceCheckingComposite_assume_existence;
+	public static String OrmEclipseLinkExistenceCheckingComposite_assume_non_existence;
+	
+	public static String EclipseLinkExpiryComposite_expirySection;
+	public static String EclipseLinkExpiryComposite_noExpiry;
+	public static String EclipseLinkExpiryComposite_timeToLiveExpiry;
+	public static String EclipseLinkExpiryComposite_timeToLiveExpiryExpireAfter;
+	public static String EclipseLinkExpiryComposite_timeToLiveExpiryMilliseconds;
+	public static String EclipseLinkExpiryComposite_dailyExpiry;
+	public static String EclipseLinkExpiryComposite_timeOfDayExpiryExpireAt;
+	
+	public static String EclipseLinkJoinFetchComposite_label;
+	public static String EclipseLinkJoinFetchComposite_inner;
+	public static String EclipseLinkJoinFetchComposite_outer;	
+	
+	public static String EclipseLinkMutableComposite_mutableLabel;
+	public static String EclipseLinkMutableComposite_mutableLabelDefault;
+	public static String EclipseLinkMutableComposite_true;
+	public static String EclipseLinkMutableComposite_false;
+	
+	public static String EclipseLinkObjectTypeConverterComposite_dataTypeLabel;
+	public static String EclipseLinkObjectTypeConverterComposite_objectTypeLabel;
+	public static String EclipseLinkObjectTypeConverterComposite_conversionValueEdit;
+	public static String EclipseLinkObjectTypeConverterComposite_conversionValuesDataValueColumn;
+	public static String EclipseLinkObjectTypeConverterComposite_conversionValuesObjectValueColumn;
+	public static String EclipseLinkObjectTypeConverterComposite_defaultObjectValueLabel;
+	public static String EclipseLinkObjectTypeConverterComposite_conversionValuesGroupTitle;
+	
+	public static String EclipseLinkConversionValueDialog_addConversionValue;
+	public static String EclipseLinkConversionValueDialog_editConversionValue;
+	public static String EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle;
+	public static String EclipseLinkConversionValueDialog_editConversionValueDescriptionTitle;
+	public static String EclipseLinkConversionValueDialog_addConversionValueDescription;
+	public static String EclipseLinkConversionValueDialog_editConversionValueDescription;
+	
+	public static String EclipseLinkConversionValueDialog_dataValue;
+	public static String EclipseLinkConversionValueDialog_objectValue;
+	public static String EclipseLinkConversionValueStateObject_dataValueMustBeSpecified;
+	public static String EclipseLinkConversionValueStateObject_objectValueMustBeSpecified;
+	public static String EclipseLinkConversionValueStateObject_dataValueAlreadyExists;
+	
+	public static String EclipseLinkPrivateOwnedComposite_privateOwnedLabel;
+	
+	public static String EclipseLinkReadOnlyComposite_readOnlyLabel;
+	public static String EclipseLinkReadOnlyComposite_readOnlyWithDefault;
+	
+	public static String EclipseLinkTypeConverterComposite_dataTypeLabel;
+	public static String EclipseLinkTypeConverterComposite_objectTypeLabel;
 
-	public static String DefaultOneToOneMappingUiProvider_label;
-	public static String DefaultVariableOneToOneMappingUiProvider_label;
-	public static String DefaultOneToManyMappingUiProvider_label;
-	public static String DefaultOneToOneMappingUiProvider_linkLabel;
-	public static String DefaultVariableOneToOneMappingUiProvider_linkLabel;
-	public static String DefaultOneToManyMappingUiProvider_linkLabel;
-	
-	public static String ConvertersComposite_Label;
+	public static String DefaultEclipseLinkOneToOneMappingUiProvider_label;
+	public static String DefaultEclipseLinkVariableOneToOneMappingUiProvider_label;
+	public static String DefaultEclipseLinkOneToManyMappingUiProvider_label;
+	public static String DefaultEclipseLinkOneToOneMappingUiProvider_linkLabel;
+	public static String DefaultEclipseLinkVariableOneToOneMappingUiProvider_linkLabel;
+	public static String DefaultEclipseLinkOneToManyMappingUiProvider_linkLabel;
+	
+	public static String EclipseLinkConvertersComposite_Label;
 	public static String EclipseLinkConverterDialog_name;
 	public static String EclipseLinkConverterDialog_converterType;
 	public static String EclipseLinkConverterDialog_addConverter;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkAlwaysRefreshComposite.java
index e75058d3cd..465b6dc3f0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkAlwaysRefreshComposite.java
@@ -26,12 +26,12 @@ import org.eclipse.swt.widgets.Composite;
  * This composite simply shows a tri-state check box for the Always Refresh option.
  * 
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
+public class EclipseLinkAlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -39,7 +39,7 @@ public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public AlwaysRefreshComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkAlwaysRefreshComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
@@ -50,7 +50,7 @@ public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
 
 		addTriStateCheckBoxWithDefault(
 			container,
-			EclipseLinkUiMappingsMessages.AlwaysRefreshComposite_alwaysRefreshLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkAlwaysRefreshComposite_alwaysRefreshLabel,
 			buildAlwaysRefreshHolder(),
 			buildAlwaysRefreshStringHolder(),
 			EclipseLinkHelpContextIds.CACHING_ALWAYS_REFRESH
@@ -77,9 +77,9 @@ public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.AlwaysRefreshComposite_alwaysRefreshDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkAlwaysRefreshComposite_alwaysRefreshDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.AlwaysRefreshComposite_alwaysRefreshLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkAlwaysRefreshComposite_alwaysRefreshLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/BasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingComposite.java
index 7770231f75..5e91f56de7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/BasicCollectionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class BasicCollectionMappingComposite extends FormPane<EclipseLinkBasicCollectionMapping>
+public class EclipseLinkBasicCollectionMappingComposite extends FormPane<EclipseLinkBasicCollectionMapping>
                                        implements JpaComposite
 {
 	/**
@@ -31,7 +31,7 @@ public class BasicCollectionMappingComposite extends FormPane<EclipseLinkBasicCo
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public BasicCollectionMappingComposite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
+	public EclipseLinkBasicCollectionMappingComposite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingUiProvider.java
index e59ae825eb..739c95b4c7 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicCollectionMappingUiProvider.java
@@ -28,11 +28,11 @@ public abstract class EclipseLinkBasicCollectionMappingUiProvider<T extends Ecli
 	}
 	
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.BasicCollectionMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.EclipseLinkBasicCollectionMappingUiProvider_label;
 	}
 	
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.BasicCollectionMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.EclipseLinkBasicCollectionMappingUiProvider_linkLabel;
 	}
 	
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/BasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingComposite.java
index 99ed3f1348..eb3d2e99cc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/BasicMapMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class BasicMapMappingComposite extends FormPane<EclipseLinkBasicMapMapping>
+public class EclipseLinkBasicMapMappingComposite extends FormPane<EclipseLinkBasicMapMapping>
                                        implements JpaComposite
 {
 	/**
@@ -31,7 +31,7 @@ public class BasicMapMappingComposite extends FormPane<EclipseLinkBasicMapMappin
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public BasicMapMappingComposite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
+	public EclipseLinkBasicMapMappingComposite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingUiProvider.java
index d75fc63ee8..8fd04fba79 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMapMappingUiProvider.java
@@ -30,11 +30,11 @@ public abstract class EclipseLinkBasicMapMappingUiProvider<T extends EclipseLink
 	}
 	
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.BasicMapMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.EclipseLinkBasicMapMappingUiProvider_label;
 	}
 	
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.BasicMapMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.EclipseLinkBasicMapMappingUiProvider_linkLabel;
 	}
 	
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMappingComposite.java
index 26547e281b..a6b8afe135 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkBasicMappingComposite.java
@@ -126,7 +126,7 @@ public class EclipseLinkBasicMappingComposite extends FormPane<BasicMapping>
 		new OptionalComposite(this, addSubPane(container, 4));
 		
 		// Mutable widgets
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}
 	
 	protected void initializeTypePane(Composite container) {
@@ -187,7 +187,7 @@ public class EclipseLinkBasicMappingComposite extends FormPane<BasicMapping>
 	}
 
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new ConvertComposite(convertHolder, container, getWidgetFactory());
+		return new EclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 	
 	protected PropertyValueModel<Column> buildColumnHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheCoordinationTypeComposite.java
index 55fa061dd7..be2af1ee4c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheCoordinationTypeComposite.java
@@ -27,12 +27,12 @@ import org.eclipse.swt.widgets.Composite;
  * ----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching> {
+public class EclipseLinkCacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching> {
 
 	/**
 	 * Creates a new <code>CacheTypeComposite</code>.
@@ -40,7 +40,7 @@ public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public CacheCoordinationTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkCacheCoordinationTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -71,7 +71,7 @@ public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching>
 			protected String displayString(EclipseLinkCacheCoordinationType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					CacheCoordinationTypeComposite.this,
+					EclipseLinkCacheCoordinationTypeComposite.this,
 					value
 				);
 			}
@@ -98,7 +98,7 @@ public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching>
 
 		addLabeledComposite(
 			container,
-			EclipseLinkUiMappingsMessages.CacheCoordinationTypeComposite_label,
+			EclipseLinkUiMappingsMessages.EclipseLinkCacheCoordinationTypeComposite_label,
 			addCacheCoordinationTypeCombo(container),
 			EclipseLinkHelpContextIds.CACHING_CACHE_COORDINATION_TYPE
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheSizeComposite.java
index 91e4d410fe..ca405b5976 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheSizeComposite.java
@@ -27,12 +27,12 @@ import org.eclipse.swt.widgets.Composite;
  * ----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
+public class EclipseLinkCacheSizeComposite extends FormPane<EclipseLinkCaching> {
 
 	/**
 	 * Creates a new <code>CacheSizeComposite</code>.
@@ -40,7 +40,7 @@ public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public CacheSizeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkCacheSizeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -56,7 +56,7 @@ public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
 			
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.CacheSizeComposite_size;
+				return EclipseLinkUiMappingsMessages.EclipseLinkCacheSizeComposite_size;
 			}
 		
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheTypeComposite.java
index 33541a345d..9281dcb8f8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCacheTypeComposite.java
@@ -27,12 +27,12 @@ import org.eclipse.swt.widgets.Composite;
  * ----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
+public class EclipseLinkCacheTypeComposite extends FormPane<EclipseLinkCaching> {
 
 	/**
 	 * Creates a new <code>CacheTypeComposite</code>.
@@ -40,7 +40,7 @@ public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public CacheTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkCacheTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -71,7 +71,7 @@ public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
 			protected String displayString(EclipseLinkCacheType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					CacheTypeComposite.this,
+					EclipseLinkCacheTypeComposite.this,
 					value
 				);
 			}
@@ -98,7 +98,7 @@ public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
 
 		addLabeledComposite(
 			container,
-			EclipseLinkUiMappingsMessages.CacheTypeComposite_label,
+			EclipseLinkUiMappingsMessages.EclipseLinkCacheTypeComposite_label,
 			addCacheTypeCombo(container),
 			EclipseLinkHelpContextIds.CACHING_CACHE_TYPE
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCachingComposite.java
index db75f7f5c6..25dc6caced 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCachingComposite.java
@@ -15,7 +15,7 @@ import java.util.Collection;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaEntityComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkEntityComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.util.PaneEnabler;
@@ -49,20 +49,20 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @see Entity
  * @see EclipseLinkCaching
- * @see EclipseLinkJavaEntityComposite - The parent container
- * @see CacheTypeComposite
- * @see CacheSizeComposite
- * @see AlwaysRefreshComposite
- * @see RefreshOnlyIfNewerComposite
- * @see DisableHitsComposite
+ * @see JavaEclipseLinkEntityComposite - The parent container
+ * @see EclipseLinkCacheTypeComposite
+ * @see EclipseLinkCacheSizeComposite
+ * @see EclipseLinkAlwaysRefreshComposite
+ * @see EclipseLinkRefreshOnlyIfNewerComposite
+ * @see EclipseLinkDisableHitsComposite
  *
  * @version 2.1
  * @since 2.1
  */
-public abstract class CachingComposite<T extends EclipseLinkCaching> extends FormPane<T>
+public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> extends FormPane<T>
 {
 
-	protected CachingComposite(FormPane<?> parentPane,
+	protected EclipseLinkCachingComposite(FormPane<?> parentPane,
         PropertyValueModel<T> subjectHolder,
         Composite parent) {
 
@@ -75,7 +75,7 @@ public abstract class CachingComposite<T extends EclipseLinkCaching> extends For
 		//Shared Check box, uncheck this and the rest of the panel is disabled
 		addTriStateCheckBoxWithDefault(
 			addSubPane(container, 8),
-			EclipseLinkUiMappingsMessages.CachingComposite_sharedLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkCachingComposite_sharedLabel,
 			buildSpecifiedSharedHolder(),
 			buildSharedStringHolder(),
 			EclipseLinkHelpContextIds.CACHING_SHARED
@@ -85,13 +85,13 @@ public abstract class CachingComposite<T extends EclipseLinkCaching> extends For
 
 		Collection<Pane<?>> panes = new ArrayList<Pane<?>>();
 		
-		panes.add(new CacheTypeComposite(this, subPane));
-		panes.add(new CacheSizeComposite(this, subPane));
+		panes.add(new EclipseLinkCacheTypeComposite(this, subPane));
+		panes.add(new EclipseLinkCacheSizeComposite(this, subPane));
 		
 		// Advanced sub-pane
 		Composite advancedSection = addCollapsableSubSection(
 			subPane,
-			EclipseLinkUiMappingsMessages.CachingComposite_advanced,
+			EclipseLinkUiMappingsMessages.EclipseLinkCachingComposite_advanced,
 			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
 		);
 
@@ -103,11 +103,11 @@ public abstract class CachingComposite<T extends EclipseLinkCaching> extends For
 	}
 	
 	protected void initializeAdvancedPane(Composite container, Collection<Pane<?>> panes) {
-		panes.add(new ExpiryComposite(this, container));
-		panes.add(new AlwaysRefreshComposite(this, container));
-		panes.add(new RefreshOnlyIfNewerComposite(this, container));
-		panes.add(new DisableHitsComposite(this, container));
-		panes.add(new CacheCoordinationTypeComposite(this, container));
+		panes.add(new EclipseLinkExpiryComposite(this, container));
+		panes.add(new EclipseLinkAlwaysRefreshComposite(this, container));
+		panes.add(new EclipseLinkRefreshOnlyIfNewerComposite(this, container));
+		panes.add(new EclipseLinkDisableHitsComposite(this, container));
+		panes.add(new EclipseLinkCacheCoordinationTypeComposite(this, container));
 	}
 	
 	protected abstract void initializeExistenceCheckingComposite(Composite parent);
@@ -144,9 +144,9 @@ public abstract class CachingComposite<T extends EclipseLinkCaching> extends For
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.CachingComposite_sharedLabelDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkCachingComposite_sharedLabelDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.CachingComposite_sharedLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkCachingComposite_sharedLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ChangeTrackingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkChangeTrackingComposite.java
index 7f6d7b2144..fde66e9415 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ChangeTrackingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkChangeTrackingComposite.java
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class ChangeTrackingComposite extends FormPane<EclipseLinkChangeTracking> {
+public class EclipseLinkChangeTrackingComposite extends FormPane<EclipseLinkChangeTracking> {
 
 	/**
 	 * Creates a new <code>ChangeTrackingComposite</code>.
@@ -39,7 +39,7 @@ public class ChangeTrackingComposite extends FormPane<EclipseLinkChangeTracking>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ChangeTrackingComposite(FormPane<?> parentPane, 
+	public EclipseLinkChangeTrackingComposite(FormPane<?> parentPane, 
 								PropertyValueModel<? extends EclipseLinkChangeTracking> subjectHolder,
 								Composite parent) {
 
@@ -53,7 +53,7 @@ public class ChangeTrackingComposite extends FormPane<EclipseLinkChangeTracking>
             container,
             addLabel( 
                  container, 
-                 EclipseLinkUiMappingsMessages.ChangeTrackingComposite_label), 
+                 EclipseLinkUiMappingsMessages.EclipseLinkChangeTrackingComposite_label), 
             addChangeTrackingTypeCombo(container).getControl(), 
             null 
        );
@@ -84,7 +84,7 @@ public class ChangeTrackingComposite extends FormPane<EclipseLinkChangeTracking>
 			protected String displayString(EclipseLinkChangeTrackingType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					ChangeTrackingComposite.this,
+					EclipseLinkChangeTrackingComposite.this,
 					value
 				);
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConversionValueDialog.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConversionValueDialog.java
index cff145d627..ee6caef5e4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConversionValueDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConversionValueDialog.java
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Text;
  * @version 2.1
  * @since 2.1
  */
-public class ConversionValueDialog extends ValidatingDialog<ConversionValueStateObject> {
+public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLinkConversionValueStateObject> {
 
 	/**
 	 * when creating a new EclipseLinkConversionValue, 'conversionValue' will be null
@@ -45,21 +45,21 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 	/**
 	 * Use this constructor to create a new conversion value
 	 */
-	public ConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter) {
+	public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter) {
 		this(parent,objectTypeConverter, null);
 	}
 
 	/**
 	 * Use this constructor to edit an existing conversion value
 	 */
-	public ConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, EclipseLinkConversionValue conversionValue) {
+	public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, EclipseLinkConversionValue conversionValue) {
 		super(parent);
 		this.objectTypeConverter = objectTypeConverter;
 		this.conversionValue = conversionValue;
 	}
 
 	@Override
-	protected ConversionValueStateObject buildStateObject() {
+	protected EclipseLinkConversionValueStateObject buildStateObject() {
 		String dataValue = null;
 		String objectValue = null;
 		Set<String> dataValues = CollectionTools.set(this.objectTypeConverter.dataValues());
@@ -69,7 +69,7 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 			//remove *this* dataValue, don't want a duplicate data value error
 			dataValues.remove(dataValue);
 		}
-		return new ConversionValueStateObject(
+		return new EclipseLinkConversionValueStateObject(
 			dataValue, 
 			objectValue, 
 			dataValues);
@@ -86,29 +86,29 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 	@Override
 	protected String getTitle() {
 		return (this.isAddDialog()) ?
-						EclipseLinkUiMappingsMessages.ConversionValueDialog_addConversionValue
+						EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_addConversionValue
 					:
-						EclipseLinkUiMappingsMessages.ConversionValueDialog_editConversionValue;
+						EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_editConversionValue;
 	}
 
 	@Override
 	protected String getDescriptionTitle() {
 		return (this.isAddDialog()) ?
-			EclipseLinkUiMappingsMessages.ConversionValueDialog_addConversionValueDescriptionTitle
+			EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle
 		:
-			EclipseLinkUiMappingsMessages.ConversionValueDialog_editConversionValueDescriptionTitle;
+			EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_editConversionValueDescriptionTitle;
 	}
 	
 	@Override
 	protected String getDescription() {
 		return (this.isAddDialog()) ?
-			EclipseLinkUiMappingsMessages.ConversionValueDialog_addConversionValueDescription
+			EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_addConversionValueDescription
 		:
-			EclipseLinkUiMappingsMessages.ConversionValueDialog_editConversionValueDescription;
+			EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_editConversionValueDescription;
 	}
 	
 	@Override
-	protected DialogPane<ConversionValueStateObject> buildLayout(Composite container) {
+	protected DialogPane<EclipseLinkConversionValueStateObject> buildLayout(Composite container) {
 		return new ConversionValueDialogPane(container);
 	}
 	
@@ -150,32 +150,32 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 		return getSubject().getObjectValue();
 	}
 	
-	private class ConversionValueDialogPane extends DialogPane<ConversionValueStateObject> {
+	private class ConversionValueDialogPane extends DialogPane<EclipseLinkConversionValueStateObject> {
 
 		private Text dataValueText;
 		private Text objectValueText;
 
 		ConversionValueDialogPane(Composite parent) {
-			super(ConversionValueDialog.this.getSubjectHolder(), parent);
+			super(EclipseLinkConversionValueDialog.this.getSubjectHolder(), parent);
 		}
 
 		@Override
 		protected void initializeLayout(Composite container) {
 			this.dataValueText = addLabeledText(
 				container,
-				EclipseLinkUiMappingsMessages.ConversionValueDialog_dataValue,
+				EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_dataValue,
 				buildDataValueHolder()
 			);
 			
 			this.objectValueText = addLabeledText(
 				container,
-				EclipseLinkUiMappingsMessages.ConversionValueDialog_objectValue,
+				EclipseLinkUiMappingsMessages.EclipseLinkConversionValueDialog_objectValue,
 				buildObjectValueHolder()
 			);
 		}
 
 		private WritablePropertyValueModel<String> buildDataValueHolder() {
-			return new PropertyAspectAdapter<ConversionValueStateObject, String>(getSubjectHolder(), ConversionValueStateObject.DATA_VALUE_PROPERTY) {
+			return new PropertyAspectAdapter<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.DATA_VALUE_PROPERTY) {
 				@Override
 				protected String buildValue_() {
 					return this.subject.getDataValue();
@@ -189,7 +189,7 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 		}
 
 		private WritablePropertyValueModel<String> buildObjectValueHolder() {
-			return new PropertyAspectAdapter<ConversionValueStateObject, String>(getSubjectHolder(), ConversionValueStateObject.OBJECT_VALUE_PROPERTY) {
+			return new PropertyAspectAdapter<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.OBJECT_VALUE_PROPERTY) {
 				@Override
 				protected String buildValue_() {
 					return this.subject.getObjectValue();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConversionValueStateObject.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConversionValueStateObject.java
index 3bbcf48174..45b871159b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConversionValueStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConversionValueStateObject.java
@@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.node.Problem;
  * @since 2.1
  */
 @SuppressWarnings("nls")
-final class ConversionValueStateObject extends AbstractNode
+final class EclipseLinkConversionValueStateObject extends AbstractNode
 {
 	/**
 	 * The initial dataValue or <code>null</code>
@@ -67,7 +67,7 @@ final class ConversionValueStateObject extends AbstractNode
 	 * @param names The collection of names that can't be used or an empty
 	 * collection if none are available
 	 */
-	ConversionValueStateObject(String dataValue, String objectValue, Collection<String> dataValues) {
+	EclipseLinkConversionValueStateObject(String dataValue, String objectValue, Collection<String> dataValues) {
 		super(null);
 
 		this.dataValue  = dataValue;
@@ -77,16 +77,16 @@ final class ConversionValueStateObject extends AbstractNode
 
 	private void addDataValueProblemsTo(List<Problem> currentProblems) {
 		if (StringTools.stringIsEmpty(this.dataValue)) {
-			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.ConversionValueStateObject_dataValueMustBeSpecified));
+			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.EclipseLinkConversionValueStateObject_dataValueMustBeSpecified));
 		}
 		else if (this.dataValues.contains(this.dataValue)) {
-			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.ConversionValueStateObject_dataValueAlreadyExists));
+			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.EclipseLinkConversionValueStateObject_dataValueAlreadyExists));
 		}
 	}
 
 	private void addObjectValueProblemsTo(List<Problem> currentProblems) {
 		if (StringTools.stringIsEmpty(this.objectValue)) {
-			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.ConversionValueStateObject_objectValueMustBeSpecified));
+			currentProblems.add(buildProblem(EclipseLinkUiMappingsMessages.EclipseLinkConversionValueStateObject_objectValueMustBeSpecified));
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConvertComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConvertComposite.java
index cc0590c7d8..81f6645246 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ConvertComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkConvertComposite.java
@@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class ConvertComposite extends FormPane<EclipseLinkConvert>
+public class EclipseLinkConvertComposite extends FormPane<EclipseLinkConvert>
 {
 
 	/**
@@ -74,7 +74,7 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ConvertComposite(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder,
+	public EclipseLinkConvertComposite(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -85,7 +85,7 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 	protected void initializeLayout(Composite container) {
 		CCombo combo = addLabeledEditableCCombo(
 			container,
-			EclipseLinkUiMappingsMessages.ConvertComposite_converterNameLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_converterNameLabel,
 			buildConvertNameListHolder(),
 			buildConvertNameHolder(),
 			buildNameConverter(),
@@ -95,23 +95,23 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 		
 		Composite subSection = addCollapsableSubSection(
 			container, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_defineConverterSection, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_defineConverterSection, 
 			new SimplePropertyValueModel<Boolean>(Boolean.FALSE));
 		
 		// No Converter
 		addRadioButton(
 			subSection, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_default, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_default, 
 			buildNoConverterHolder(), 
 			null);
 		PropertyValueModel<EclipseLinkConverter> converterHolder = buildConverterHolder();
 		// CustomConverter
 		addRadioButton(
 			subSection, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_custom, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_custom, 
 			buildConverterHolder(EclipseLinkConverter.CUSTOM_CONVERTER), 
 			null);
-		CustomConverterComposite converterComposite = new CustomConverterComposite(buildCustomConverterHolder(converterHolder), subSection, getWidgetFactory());
+		EclipseLinkCustomConverterComposite converterComposite = new EclipseLinkCustomConverterComposite(buildCustomConverterHolder(converterHolder), subSection, getWidgetFactory());
 		GridData gridData = (GridData) converterComposite.getControl().getLayoutData();
 		gridData.horizontalIndent = 20;
 		registerSubPane(converterComposite);
@@ -119,10 +119,10 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 		// Type Converter
 		addRadioButton(
 			subSection, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_type, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_type, 
 			buildConverterHolder(EclipseLinkConverter.TYPE_CONVERTER), 
 			null);
-		TypeConverterComposite typeConverterComposite = new TypeConverterComposite(buildTypeConverterHolder(converterHolder), subSection, getWidgetFactory());
+		EclipseLinkTypeConverterComposite typeConverterComposite = new EclipseLinkTypeConverterComposite(buildTypeConverterHolder(converterHolder), subSection, getWidgetFactory());
 		gridData = (GridData) typeConverterComposite.getControl().getLayoutData();
 		gridData.horizontalIndent = 20;
 		registerSubPane(typeConverterComposite);
@@ -130,10 +130,10 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 		// Object Type Converter
 		addRadioButton(
 			subSection, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_objectType, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_objectType, 
 			buildConverterHolder(EclipseLinkConverter.OBJECT_TYPE_CONVERTER), 
 			null);
-		ObjectTypeConverterComposite objectTypeConverterComposite = new ObjectTypeConverterComposite(buildObjectTypeConverterHolder(converterHolder), subSection, getWidgetFactory());
+		EclipseLinkObjectTypeConverterComposite objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(buildObjectTypeConverterHolder(converterHolder), subSection, getWidgetFactory());
 		gridData = (GridData) objectTypeConverterComposite.getControl().getLayoutData();
 		gridData.horizontalIndent = 20;
 		registerSubPane(objectTypeConverterComposite);
@@ -141,10 +141,10 @@ public class ConvertComposite extends FormPane<EclipseLinkConvert>
 		// Struct Converter
 		addRadioButton(
 			subSection, 
-			EclipseLinkUiMappingsMessages.ConvertComposite_struct, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_struct, 
 			buildConverterHolder(EclipseLinkConverter.STRUCT_CONVERTER), 
 			null);
-		StructConverterComposite structConverterComposite = new StructConverterComposite(buildStructConverterHolder(converterHolder), subSection, getWidgetFactory());
+		EclipseLinkStructConverterComposite structConverterComposite = new EclipseLinkStructConverterComposite(buildStructConverterHolder(converterHolder), subSection, getWidgetFactory());
 		gridData = (GridData) structConverterComposite.getControl().getLayoutData();
 		gridData.horizontalIndent = 20;
 		registerSubPane(structConverterComposite);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CustomConverterComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCustomConverterComposite.java
index b14766a783..4312f2597f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CustomConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCustomConverterComposite.java
@@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkConverter
- * @see ConvertComposite - A container of this widget
+ * @see EclipseLinkConvertComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class CustomConverterComposite extends FormPane<EclipseLinkCustomConverter>
+public class EclipseLinkCustomConverterComposite extends FormPane<EclipseLinkCustomConverter>
 {
 
 	/**
@@ -46,7 +46,7 @@ public class CustomConverterComposite extends FormPane<EclipseLinkCustomConverte
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public CustomConverterComposite(PropertyValueModel<? extends EclipseLinkCustomConverter> subjectHolder,
+	public EclipseLinkCustomConverterComposite(PropertyValueModel<? extends EclipseLinkCustomConverter> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -58,7 +58,7 @@ public class CustomConverterComposite extends FormPane<EclipseLinkCustomConverte
 		
 		addLabeledText(
 			container, 
-			EclipseLinkUiMappingsMessages.ConverterComposite_nameTextLabel, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_nameTextLabel, 
 			buildNameTextHolder());
 		
 		addClassChooser(container);
@@ -116,7 +116,7 @@ public class CustomConverterComposite extends FormPane<EclipseLinkCustomConverte
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.ConverterComposite_classLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_classLabel;
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CustomizerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCustomizerComposite.java
index bee383a951..dab058b14b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CustomizerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkCustomizerComposite.java
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class CustomizerComposite extends FormPane<EclipseLinkCustomizer>
+public class EclipseLinkCustomizerComposite extends FormPane<EclipseLinkCustomizer>
 {
 	/**
 	 * Creates a new <code>CustomizerComposite</code>.
@@ -34,7 +34,7 @@ public class CustomizerComposite extends FormPane<EclipseLinkCustomizer>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public CustomizerComposite(FormPane<?> parentPane, 
+	public EclipseLinkCustomizerComposite(FormPane<?> parentPane, 
 		PropertyValueModel<? extends EclipseLinkCustomizer> subjectHolder,
 		Composite parent) {
 
@@ -77,7 +77,7 @@ public class CustomizerComposite extends FormPane<EclipseLinkCustomizer>
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.CustomizerComposite_classLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkCustomizerComposite_classLabel;
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkDisableHitsComposite.java
index e041a7b5bb..c88cb016dc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkDisableHitsComposite.java
@@ -25,12 +25,12 @@ import org.eclipse.swt.widgets.Composite;
  * This composite simply shows a tri-state check box for the Disable Hits option.
  * 
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
+public class EclipseLinkDisableHitsComposite extends FormPane<EclipseLinkCaching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -38,7 +38,7 @@ public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public DisableHitsComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkDisableHitsComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
@@ -49,7 +49,7 @@ public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
 
 		addTriStateCheckBoxWithDefault(
 			container,
-			EclipseLinkUiMappingsMessages.DisableHitsComposite_disableHitsLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkDisableHitsComposite_disableHitsLabel,
 			buildDisableHitsHolder(),
 			buildDisableHitsStringHolder(),
 			EclipseLinkHelpContextIds.CACHING_DISABLE_HITS
@@ -76,9 +76,9 @@ public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.DisableHitsComposite_disableHitsDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkDisableHitsComposite_disableHitsDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.DisableHitsComposite_disableHitsLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkDisableHitsComposite_disableHitsLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEmbeddableAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEmbeddableAdvancedComposite.java
index 61e16a8300..768400ed54 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEmbeddableAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEmbeddableAdvancedComposite.java
@@ -35,8 +35,8 @@ public class EclipseLinkEmbeddableAdvancedComposite extends FormPane<Embeddable>
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
 		
-		new CustomizerComposite(this, buildCustomizerHolder(), container);
-		new ChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
+		new EclipseLinkCustomizerComposite(this, buildCustomizerHolder(), container);
+		new EclipseLinkChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkCustomizer> buildCustomizerHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEntityAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEntityAdvancedComposite.java
index 731bfa3c80..836b05a393 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEntityAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkEntityAdvancedComposite.java
@@ -36,9 +36,9 @@ public class EclipseLinkEntityAdvancedComposite extends FormPane<Entity> {
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
 		
-		new ReadOnlyComposite(this, buildReadOnlyHolder(), container);
-		new CustomizerComposite(this, buildCustomizerHolder(), container);
-		new ChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
+		new EclipseLinkReadOnlyComposite(this, buildReadOnlyHolder(), container);
+		new EclipseLinkCustomizerComposite(this, buildCustomizerHolder(), container);
+		new EclipseLinkChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkReadOnly> buildReadOnlyHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExpiryComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkExpiryComposite.java
index 8dd3c9f15b..ac934e86de 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExpiryComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkExpiryComposite.java
@@ -44,14 +44,14 @@ import org.eclipse.swt.widgets.Group;
  *
  * @see EclipseLinkCaching
  * @see EclipseLinkExpiryTimeOfDay
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
+public class EclipseLinkExpiryComposite extends FormPane<EclipseLinkCaching> {
 
-	public ExpiryComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkExpiryComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -62,7 +62,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		// Expiry group pane
 		Group expiryGroupPane = addTitledGroup(
 			container,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_expirySection,
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_expirySection,
 			2,
 			null
 		);
@@ -70,7 +70,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		// No Expiry radio button
 		Button button = addRadioButton(
 			expiryGroupPane,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_noExpiry,
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_noExpiry,
 			buildNoExpiryHolder(),
 			null
 		);
@@ -82,7 +82,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		// Time To Live Expiry radio button
 		addRadioButton(
 			expiryGroupPane,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_timeToLiveExpiry,
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_timeToLiveExpiry,
 			buildExpiryHolder(),
 			null
 		);
@@ -92,7 +92,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		// Daily Expiry radio button
 		addRadioButton(
 			expiryGroupPane,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_dailyExpiry,
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_dailyExpiry,
 			buildTimeOfDayExpiryBooleanHolder(),
 			null
 		);
@@ -106,7 +106,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 
 		Control expireAfterLabel = addUnmanagedLabel(
 			container,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_timeToLiveExpiryExpireAfter
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_timeToLiveExpiryExpireAfter
 		);
 	
 		IntegerCombo<?> combo = addTimeToLiveExpiryCombo(container);
@@ -116,7 +116,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		
 		Control millisecondsLabel =	addUnmanagedLabel(
 			container,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_timeToLiveExpiryMilliseconds
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_timeToLiveExpiryMilliseconds
 		);
 		
 		new ControlEnabler(buildTimeToLiveExpiryEnabler(), expireAfterLabel, combo.getCombo(), millisecondsLabel);
@@ -128,7 +128,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 
 		Control expireAtLabel = addUnmanagedLabel(
 			container,
-			EclipseLinkUiMappingsMessages.ExpiryComposite_timeOfDayExpiryExpireAt
+			EclipseLinkUiMappingsMessages.EclipseLinkExpiryComposite_timeOfDayExpiryExpireAt
 		);
 		
 		PropertyValueModel<EclipseLinkExpiryTimeOfDay> timeOfDayExpiryHolder = buildTimeOfDayExpiryHolder();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkIdMappingComposite.java
index 3e3153036a..aa50b36c2c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkIdMappingComposite.java
@@ -110,7 +110,7 @@ public class EclipseLinkIdMappingComposite extends FormPane<IdMapping>
 		container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
 
 		// Mutable widgets
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}	
 	
 	protected void initializeTypePane(Composite container) {
@@ -154,7 +154,7 @@ public class EclipseLinkIdMappingComposite extends FormPane<IdMapping>
 	}
 	
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new ConvertComposite(convertHolder, container, getWidgetFactory());
+		return new EclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 
 	protected WritablePropertyValueModel<Boolean> buildNoConverterHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/JoinFetchComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkJoinFetchComposite.java
index b2ddbf4e26..92652d34c9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/JoinFetchComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkJoinFetchComposite.java
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class JoinFetchComposite extends FormPane<EclipseLinkJoinFetch> {
+public class EclipseLinkJoinFetchComposite extends FormPane<EclipseLinkJoinFetch> {
 
 	/**
 	 * Creates a new <code>JoinFetchComposite</code>.
@@ -45,7 +45,7 @@ public class JoinFetchComposite extends FormPane<EclipseLinkJoinFetch> {
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public JoinFetchComposite(FormPane<?> parentPane, 
+	public EclipseLinkJoinFetchComposite(FormPane<?> parentPane, 
 								PropertyValueModel<? extends EclipseLinkJoinFetch> subjectHolder,
 								Composite parent) {
 
@@ -58,7 +58,7 @@ public class JoinFetchComposite extends FormPane<EclipseLinkJoinFetch> {
             container, 
             addLabel( 
                  container, 
-                 EclipseLinkUiMappingsMessages.JoinFetchComposite_label), 
+                 EclipseLinkUiMappingsMessages.EclipseLinkJoinFetchComposite_label), 
             addJoinFetchTypeCombo(container).getControl(),
             null 
        );
@@ -89,7 +89,7 @@ public class JoinFetchComposite extends FormPane<EclipseLinkJoinFetch> {
 			protected String displayString(EclipseLinkJoinFetchType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					JoinFetchComposite.this,
+					EclipseLinkJoinFetchComposite.this,
 					value
 				);
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToManyMappingComposite.java
index 1362b966c8..06a37cd5be 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToManyMappingComposite.java
@@ -94,7 +94,7 @@ public class EclipseLinkManyToManyMappingComposite
 		new TargetEntityComposite(this, addPane(container, groupBoxMargin));
 		new ManyToManyJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 		new OrderingComposite(this, container);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToOneMappingComposite.java
index 7db22b7ccd..1174a6d393 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkManyToOneMappingComposite.java
@@ -93,7 +93,7 @@ public class EclipseLinkManyToOneMappingComposite extends FormPane<ManyToOneMapp
 		new TargetEntityComposite(this, addPane(container, groupBoxMargin));
 		new ManyToOneJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new OptionalComposite(this, addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassAdvancedComposite.java
index 54d6358568..612ba03e82 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassAdvancedComposite.java
@@ -36,9 +36,9 @@ public class EclipseLinkMappedSuperclassAdvancedComposite extends FormPane<Mappe
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
 		
-		new ReadOnlyComposite(this, buildReadOnlyHolder(), container);
-		new CustomizerComposite(this, buildCustomizerHolder(), container);
-		new ChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
+		new EclipseLinkReadOnlyComposite(this, buildReadOnlyHolder(), container);
+		new EclipseLinkCustomizerComposite(this, buildCustomizerHolder(), container);
+		new EclipseLinkChangeTrackingComposite(this, buildChangeTrackingHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkReadOnly> buildReadOnlyHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/MutableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMutableComposite.java
index 4b18c0636d..5ddfa38219 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/MutableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMutableComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class MutableComposite extends FormPane<EclipseLinkMutable>
+public class EclipseLinkMutableComposite extends FormPane<EclipseLinkMutable>
 {
 	/**
 	 * Creates a new <code>MutableComposite</code>.
@@ -37,7 +37,7 @@ public class MutableComposite extends FormPane<EclipseLinkMutable>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public MutableComposite(FormPane<?> parentPane, 
+	public EclipseLinkMutableComposite(FormPane<?> parentPane, 
 		PropertyValueModel<? extends EclipseLinkMutable> subjectHolder,
 		Composite parent) {
 
@@ -48,7 +48,7 @@ public class MutableComposite extends FormPane<EclipseLinkMutable>
 	protected void initializeLayout(Composite container) {
 		addTriStateCheckBoxWithDefault(
 			container,
-			EclipseLinkUiMappingsMessages.MutableComposite_mutableLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkMutableComposite_mutableLabel,
 			buildMutableHolder(),
 			buildMutableStringHolder(),
 			null
@@ -76,9 +76,9 @@ public class MutableComposite extends FormPane<EclipseLinkMutable>
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.MutableComposite_mutableLabelDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkMutableComposite_mutableLabelDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.MutableComposite_mutableLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkMutableComposite_mutableLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ObjectTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkObjectTypeConverterComposite.java
index 5b04a26cb3..27ed171dbd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ObjectTypeConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkObjectTypeConverterComposite.java
@@ -50,12 +50,12 @@ import org.eclipse.swt.widgets.Group;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkConverter
- * @see ConvertComposite - A container of this widget
+ * @see EclipseLinkConvertComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectTypeConverter>
+public class EclipseLinkObjectTypeConverterComposite extends FormPane<EclipseLinkObjectTypeConverter>
 {
 
 	/**
@@ -64,7 +64,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ObjectTypeConverterComposite(PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectHolder,
+	public EclipseLinkObjectTypeConverterComposite(PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -76,7 +76,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		
 		addLabeledText(
 			container, 
-			EclipseLinkUiMappingsMessages.ConverterComposite_nameTextLabel, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_nameTextLabel, 
 			buildNameTextHolder());
 		
 		addDataTypeChooser(container);
@@ -86,7 +86,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 		addLabeledEditableCCombo(
 			container,
-			EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_defaultObjectValueLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_defaultObjectValueLabel,
 			buildDefaultObjectValueListHolder(),
 			buildDefaultObjectValueHolder(),
 			buildStringConverter(),
@@ -145,7 +145,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_dataTypeLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_dataTypeLabel;
 			}
 
 			@Override
@@ -196,7 +196,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_objectTypeLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_objectTypeLabel;
 			}
 
 			@Override
@@ -226,7 +226,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		// Join Columns group pane
 		Group conversionValuesGroupPane = addTitledGroup(
 			container,
-			EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_conversionValuesGroupTitle
+			EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_conversionValuesGroupTitle
 		);
 
 		WritablePropertyValueModel<EclipseLinkConversionValue> conversionValueHolder =
@@ -257,7 +257,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		return new AddRemoveListPane.AbstractAdapter() {
 
 			public void addNewItem(ObjectListSelectionModel listSelectionModel) {
-				ConversionValueDialog dialog = buildConversionValueDialogForAdd();
+				EclipseLinkConversionValueDialog dialog = buildConversionValueDialogForAdd();
 				addConversionValueFromDialog(dialog, listSelectionModel);
 			}
 
@@ -268,13 +268,13 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 			@Override
 			public String optionalButtonText() {
-				return EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_conversionValueEdit;
+				return EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_conversionValueEdit;
 			}
 
 			@Override
 			public void optionOnSelection(ObjectListSelectionModel listSelectionModel) {
 				EclipseLinkConversionValue conversionValue = (EclipseLinkConversionValue) listSelectionModel.selectedValue();
-				ConversionValueDialog dialog = new ConversionValueDialog(getControl().getShell(), getSubject(), conversionValue);
+				EclipseLinkConversionValueDialog dialog = new EclipseLinkConversionValueDialog(getControl().getShell(), getSubject(), conversionValue);
 				editConversionValueFromDialog(dialog, conversionValue);
 			}
 
@@ -290,11 +290,11 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 	}
 
 
-	protected ConversionValueDialog buildConversionValueDialogForAdd() {
-		return new ConversionValueDialog(getControl().getShell(), getSubject());
+	protected EclipseLinkConversionValueDialog buildConversionValueDialogForAdd() {
+		return new EclipseLinkConversionValueDialog(getControl().getShell(), getSubject());
 	}
 
-	protected void addConversionValueFromDialog(ConversionValueDialog dialog, ObjectListSelectionModel listSelectionModel) {
+	protected void addConversionValueFromDialog(EclipseLinkConversionValueDialog dialog, ObjectListSelectionModel listSelectionModel) {
 		if (dialog.open() != Window.OK) {
 			return;
 		}
@@ -306,7 +306,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		listSelectionModel.setSelectedValue(conversionValue);
 	}
 
-	protected void editConversionValueFromDialog(ConversionValueDialog dialog, EclipseLinkConversionValue conversionValue) {
+	protected void editConversionValueFromDialog(EclipseLinkConversionValueDialog dialog, EclipseLinkConversionValue conversionValue) {
 		if (dialog.open() != Window.OK) {
 			return;
 		}
@@ -466,11 +466,11 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 			switch (columnIndex) {
 				case ConversionValueColumnAdapter.DATA_VALUE_COLUMN: {
-					return EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_conversionValuesDataValueColumn;
+					return EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_conversionValuesDataValueColumn;
 				}
 
 				case ConversionValueColumnAdapter.OBJECT_VALUE_COLUMN: {
-					return EclipseLinkUiMappingsMessages.ObjectTypeConverterComposite_conversionValuesObjectValueColumn;
+					return EclipseLinkUiMappingsMessages.EclipseLinkObjectTypeConverterComposite_conversionValuesObjectValueColumn;
 				}
 
 				default: {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToManyMappingComposite.java
index 2da40d1aa1..60d8deb99c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToManyMappingComposite.java
@@ -100,8 +100,8 @@ public class EclipseLinkOneToManyMappingComposite
 		new TargetEntityComposite(this, addPane(container, groupBoxMargin));
 		new EclipseLinkOneToManyJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
-		new PrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 		new OrderingComposite(this, container);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToOneMappingComposite.java
index 8cc2b62ee2..53d8d140ec 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkOneToOneMappingComposite.java
@@ -53,9 +53,9 @@ public class EclipseLinkOneToOneMappingComposite extends FormPane<OneToOneMappin
 		new TargetEntityComposite(this, addPane(container, groupBoxMargin));
 		new OneToOneJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new OptionalComposite(this, addPane(container, groupBoxMargin));
-		new PrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/PrivateOwnedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkPrivateOwnedComposite.java
index e55d0db4b3..7b52c279e9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/PrivateOwnedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkPrivateOwnedComposite.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class PrivateOwnedComposite extends FormPane<EclipseLinkPrivateOwned>
+public class EclipseLinkPrivateOwnedComposite extends FormPane<EclipseLinkPrivateOwned>
 {
 	/**
 	 * Creates a new <code>PrivateOwnedComposite</code>.
@@ -32,7 +32,7 @@ public class PrivateOwnedComposite extends FormPane<EclipseLinkPrivateOwned>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public PrivateOwnedComposite(FormPane<?> parentPane, 
+	public EclipseLinkPrivateOwnedComposite(FormPane<?> parentPane, 
 		PropertyValueModel<? extends EclipseLinkPrivateOwned> subjectHolder,
 		Composite parent) {
 
@@ -59,7 +59,7 @@ public class PrivateOwnedComposite extends FormPane<EclipseLinkPrivateOwned>
 	protected void initializeLayout(Composite container) {
 		addCheckBox(
 			container,
-			EclipseLinkUiMappingsMessages.PrivateOwnedComposite_privateOwnedLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkPrivateOwnedComposite_privateOwnedLabel,
 			buildPrivateOwnedHolder(),
 			null
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ReadOnlyComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkReadOnlyComposite.java
index 39a3bd66d8..d865618fe4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ReadOnlyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkReadOnlyComposite.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class ReadOnlyComposite extends FormPane<EclipseLinkReadOnly>
+public class EclipseLinkReadOnlyComposite extends FormPane<EclipseLinkReadOnly>
 {
 	/**
 	 * Creates a new <code>ReadOnlyComposite</code>.
@@ -36,7 +36,7 @@ public class ReadOnlyComposite extends FormPane<EclipseLinkReadOnly>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ReadOnlyComposite(FormPane<?> parentPane, 
+	public EclipseLinkReadOnlyComposite(FormPane<?> parentPane, 
 		PropertyValueModel<? extends EclipseLinkReadOnly> subjectHolder,
 		Composite parent) {
 
@@ -48,7 +48,7 @@ public class ReadOnlyComposite extends FormPane<EclipseLinkReadOnly>
 		// Unique tri-state check box
 		addTriStateCheckBoxWithDefault(
 			container,
-			EclipseLinkUiMappingsMessages.ReadOnlyComposite_readOnlyLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkReadOnlyComposite_readOnlyLabel,
 			buildSpecifiedReadOnlyHolder(),
 			buildReadOnlyStringHolder(),
 			null
@@ -78,9 +78,9 @@ public class ReadOnlyComposite extends FormPane<EclipseLinkReadOnly>
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.ReadOnlyComposite_readOnlyWithDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkReadOnlyComposite_readOnlyWithDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.ReadOnlyComposite_readOnlyLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkReadOnlyComposite_readOnlyLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkRefreshOnlyIfNewerComposite.java
index 2bbb721903..5021a0c1c5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkRefreshOnlyIfNewerComposite.java
@@ -25,12 +25,12 @@ import org.eclipse.swt.widgets.Composite;
  * This composite simply shows a tri-state check box for the Refresh Only If Newer option.
  * 
  * @see EclipseLinkCaching
- * @see CachingComposite - A container of this widget
+ * @see EclipseLinkCachingComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
+public class EclipseLinkRefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -38,7 +38,7 @@ public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public RefreshOnlyIfNewerComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public EclipseLinkRefreshOnlyIfNewerComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
@@ -49,7 +49,7 @@ public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
 
 		addTriStateCheckBoxWithDefault(
 			container,
-			EclipseLinkUiMappingsMessages.RefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkRefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel,
 			buildRefreshOnlyIfNewerHolder(),
 			buildRefreshOnlyIfNewerStringHolder(),
 			EclipseLinkHelpContextIds.CACHING_REFRESH_ONLY_IF_NEWER
@@ -78,9 +78,9 @@ public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
 			protected String transform(Boolean value) {
 				if (value != null) {
 					String defaultStringValue = value.booleanValue() ? JptUiMappingsMessages.Boolean_True : JptUiMappingsMessages.Boolean_False;
-					return NLS.bind(EclipseLinkUiMappingsMessages.RefreshOnlyIfNewerComposite_refreshOnlyIfNewerDefault, defaultStringValue);
+					return NLS.bind(EclipseLinkUiMappingsMessages.EclipseLinkRefreshOnlyIfNewerComposite_refreshOnlyIfNewerDefault, defaultStringValue);
 				}
-				return EclipseLinkUiMappingsMessages.RefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkRefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel;
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/StructConverterComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkStructConverterComposite.java
index 792bdf1f4d..d695d16ccf 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/StructConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkStructConverterComposite.java
@@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkConverter
- * @see ConvertComposite - A container of this widget
+ * @see EclipseLinkConvertComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class StructConverterComposite extends FormPane<EclipseLinkStructConverter>
+public class EclipseLinkStructConverterComposite extends FormPane<EclipseLinkStructConverter>
 {
 
 	/**
@@ -46,7 +46,7 @@ public class StructConverterComposite extends FormPane<EclipseLinkStructConverte
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public StructConverterComposite(PropertyValueModel<? extends EclipseLinkStructConverter> subjectHolder,
+	public EclipseLinkStructConverterComposite(PropertyValueModel<? extends EclipseLinkStructConverter> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -58,7 +58,7 @@ public class StructConverterComposite extends FormPane<EclipseLinkStructConverte
 		
 		addLabeledText(
 			container, 
-			EclipseLinkUiMappingsMessages.ConverterComposite_nameTextLabel, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_nameTextLabel, 
 			buildNameTextHolder());
 		
 		addClassChooser(container);
@@ -116,7 +116,7 @@ public class StructConverterComposite extends FormPane<EclipseLinkStructConverte
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.ConverterComposite_classLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_classLabel;
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/TransformationMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingComposite.java
index a68e3850bb..5eb9b6694a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/TransformationMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class TransformationMappingComposite extends FormPane<EclipseLinkTransformationMapping>
+public class EclipseLinkTransformationMappingComposite extends FormPane<EclipseLinkTransformationMapping>
                                        implements JpaComposite
 {
 	/**
@@ -31,7 +31,7 @@ public class TransformationMappingComposite extends FormPane<EclipseLinkTransfor
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public TransformationMappingComposite(PropertyValueModel<? extends EclipseLinkTransformationMapping> subjectHolder,
+	public EclipseLinkTransformationMappingComposite(PropertyValueModel<? extends EclipseLinkTransformationMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingUiProvider.java
index c54f6bcb92..b11083b99b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTransformationMappingUiProvider.java
@@ -30,11 +30,11 @@ public abstract class EclipseLinkTransformationMappingUiProvider<T extends Eclip
 	}
 	
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.TransformationMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.EclipseLinkTransformationMappingUiProvider_label;
 	}
 	
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.TransformationMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.EclipseLinkTransformationMappingUiProvider_linkLabel;
 	}
 	
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/TypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTypeConverterComposite.java
index 5237958615..eb32166d61 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/TypeConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkTypeConverterComposite.java
@@ -32,12 +32,12 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EclipseLinkConverter
- * @see ConvertComposite - A container of this widget
+ * @see EclipseLinkConvertComposite - A container of this widget
  *
  * @version 2.1
  * @since 2.1
  */
-public class TypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
+public class EclipseLinkTypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
 {
 
 	/**
@@ -46,7 +46,7 @@ public class TypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public TypeConverterComposite(PropertyValueModel<? extends EclipseLinkTypeConverter> subjectHolder,
+	public EclipseLinkTypeConverterComposite(PropertyValueModel<? extends EclipseLinkTypeConverter> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -58,7 +58,7 @@ public class TypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
 		
 		addLabeledText(
 			container, 
-			EclipseLinkUiMappingsMessages.ConverterComposite_nameTextLabel, 
+			EclipseLinkUiMappingsMessages.EclipseLinkConverterComposite_nameTextLabel, 
 			buildNameTextHolder());
 		
 		addDataTypeChooser(container);
@@ -117,7 +117,7 @@ public class TypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.TypeConverterComposite_dataTypeLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkTypeConverterComposite_dataTypeLabel;
 			}
 
 			@Override
@@ -168,7 +168,7 @@ public class TypeConverterComposite extends FormPane<EclipseLinkTypeConverter>
 
 			@Override
 			protected String getLabelText() {
-				return EclipseLinkUiMappingsMessages.TypeConverterComposite_objectTypeLabel;
+				return EclipseLinkUiMappingsMessages.EclipseLinkTypeConverterComposite_objectTypeLabel;
 			}
 
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/VariableOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingComposite.java
index c0687c001d..b670802944 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/VariableOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class VariableOneToOneMappingComposite extends FormPane<EclipseLinkVariableOneToOneMapping>
+public class EclipseLinkVariableOneToOneMappingComposite extends FormPane<EclipseLinkVariableOneToOneMapping>
                                        implements JpaComposite
 {
 	/**
@@ -31,7 +31,7 @@ public class VariableOneToOneMappingComposite extends FormPane<EclipseLinkVariab
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public VariableOneToOneMappingComposite(PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> subjectHolder,
+	public EclipseLinkVariableOneToOneMappingComposite(PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingUiProvider.java
index eafab870db..edc6c5b091 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVariableOneToOneMappingUiProvider.java
@@ -29,11 +29,11 @@ public abstract class EclipseLinkVariableOneToOneMappingUiProvider<T extends Ecl
 	}
 	
 	public String getLabel() {
-		return EclipseLinkUiMappingsMessages.VariableOneToOneMappingUiProvider_label;
+		return EclipseLinkUiMappingsMessages.EclipseLinkVariableOneToOneMappingUiProvider_label;
 	}
 	
 	public String getLinkLabel() {
-		return EclipseLinkUiMappingsMessages.VariableOneToOneMappingUiProvider_linkLabel;
+		return EclipseLinkUiMappingsMessages.EclipseLinkVariableOneToOneMappingUiProvider_linkLabel;
 	}
 	
 	public String getKey() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVersionMappingComposite.java
index 5293a9f783..11cf15784d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkVersionMappingComposite.java
@@ -105,7 +105,7 @@ public class EclipseLinkVersionMappingComposite extends FormPane<VersionMapping>
 		container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
 		
 		// Mutable widgets
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}
 	
 	protected void initializeTypePane(Composite container) {
@@ -149,7 +149,7 @@ public class EclipseLinkVersionMappingComposite extends FormPane<VersionMapping>
 	}
 	
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new ConvertComposite(convertHolder, container, getWidgetFactory());
+		return new EclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 
 	protected WritablePropertyValueModel<Boolean> buildNoConverterHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkConverterDialog.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkConverterDialog.java
index 080ed59bbe..f2579ef812 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkConverterDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkConverterDialog.java
@@ -144,16 +144,16 @@ public class EclipseLinkConverterDialog extends ValidatingDialog<EclipseLinkConv
 			return new StringConverter<String>() {
 				public String convertToString(String value) {
 					if (value == EclipseLinkConverter.CUSTOM_CONVERTER) {
-						return EclipseLinkUiMappingsMessages.ConvertersComposite_customConverter;
+						return EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_customConverter;
 					}
 					if (value == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-						return EclipseLinkUiMappingsMessages.ConvertersComposite_objectTypeConverter;
+						return EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_objectTypeConverter;
 					}
 					if (value == EclipseLinkConverter.STRUCT_CONVERTER) {
-						return EclipseLinkUiMappingsMessages.ConvertersComposite_structConverter;
+						return EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_structConverter;
 					}
 					if (value == EclipseLinkConverter.TYPE_CONVERTER) {
-						return EclipseLinkUiMappingsMessages.ConvertersComposite_typeConverter;
+						return EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_typeConverter;
 					}
 					return value;
 				}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsPage.java
index 7ca0023169..ec51399d24 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsPage.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.jpt.core.context.orm.EntityMappings;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkEntityMappings;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkEntityMappings;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see EntityMappings
- * @see EntityMappingsDetailsPage - The parent container
+ * @see EclipseLinkEntityMappingsDetailsPage - The parent container
  * @see CatalogCombo
  * @see EnumFormComboViewer
  * @see OrmGeneratorsComposite
@@ -78,7 +78,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EntityMappingsDetailsPage extends org.eclipse.jpt.ui.internal.orm.details.EntityMappingsDetailsPage
+public class EclipseLinkEntityMappingsDetailsPage extends org.eclipse.jpt.ui.internal.orm.details.EntityMappingsDetailsPage
 {
 	/**
 	 * Creates a new <code>XmlEntityMappingsDetailsPage</code>.
@@ -86,7 +86,7 @@ public class EntityMappingsDetailsPage extends org.eclipse.jpt.ui.internal.orm.d
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EntityMappingsDetailsPage(Composite parent,
+	public EclipseLinkEntityMappingsDetailsPage(Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
 		super(parent, widgetFactory);
@@ -145,10 +145,10 @@ public class EntityMappingsDetailsPage extends org.eclipse.jpt.ui.internal.orm.d
 		// Converters section
 		container = addCollapsableSection(
 			container,
-			EclipseLinkUiMappingsMessages.ConvertersComposite_Label
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_Label
 		);
 		
-		new ConvertersComposite(
+		new OrmEclipseLinkConvertersComposite(
 			this,
 			buildConverterHolder(),
 			container
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsProvider.java
index 53a501193d..e06c903b95 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkEntityMappingsDetailsProvider.java
@@ -58,7 +58,7 @@ public class EclipseLinkEntityMappingsDetailsProvider
 		Composite parent,
 		WidgetFactory widgetFactory) {
 
-		return new EntityMappingsDetailsPage(parent, widgetFactory);
+		return new EclipseLinkEntityMappingsDetailsPage(parent, widgetFactory);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicCollectionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicCollectionMappingUiProvider.java
index 84579aec94..9ab0a09259 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicCollectionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicCollectionMappingUiProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicCollectionMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.BasicCollectionMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicCollectionMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicCollectionMappingUiProvider;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicCollectionMappingUiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
+public class OrmEclipseLinkBasicCollectionMappingUiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicCollectionMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmBasicCollectionMappingUiProvider();
+	private static final OrmEclipseLinkBasicCollectionMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkBasicCollectionMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmBasicCollectionMappingUiProvider extends EclipseLinkB
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicCollectionMappingUiProvider() {
+	private OrmEclipseLinkBasicCollectionMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkOrmBasicCollectionMappingUiProvider extends EclipseLinkB
 			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new BasicCollectionMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMapMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMapMappingUiProvider.java
index 49df8400d0..8b8896a129 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMapMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMapMappingUiProvider.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.BasicMapMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMapMappingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMapMappingUiProvider;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicMapMappingUiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
+public class OrmEclipseLinkBasicMapMappingUiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicMapMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmBasicMapMappingUiProvider();
+	private static final OrmEclipseLinkBasicMapMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkBasicMapMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmBasicMapMappingUiProvider extends EclipseLinkBasicMap
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicMapMappingUiProvider() {
+	private OrmEclipseLinkBasicMapMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkOrmBasicMapMappingUiProvider extends EclipseLinkBasicMap
 			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new BasicMapMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkBasicMapMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMappingComposite.java
index 71fa65cf0f..43bc311411 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMappingComposite.java
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite;
 
 //Temporary to remove the Converters section from orm basic mapping.
 //This is supported in EclipseLink in version 1.1, but not 1.0
-public class EclipseLinkOrmBasicMappingComposite extends EclipseLinkBasicMappingComposite
+public class OrmEclipseLinkBasicMappingComposite extends EclipseLinkBasicMappingComposite
 {
 	/**
 	 * Creates a new <code>EclipseLinkOrmBasicMappingComposite</code>.
@@ -28,7 +28,7 @@ public class EclipseLinkOrmBasicMappingComposite extends EclipseLinkBasicMapping
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkOrmBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
+	public OrmEclipseLinkBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -38,7 +38,7 @@ public class EclipseLinkOrmBasicMappingComposite extends EclipseLinkBasicMapping
 	@Override
 	//everything but the 'Defaine Converter' section.  This is not supported in eclipselink 1.0, but is in 1.1
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new OrmConvertComposite(convertHolder, container, getWidgetFactory());
+		return new OrmEclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMappingUiProvider.java
index 75cab0e614..2401279f00 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmBasicMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkBasicMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractBasicMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicMappingUiProvider
-	extends AbstractBasicMappingUiProvider<EclipseLinkOrmBasicMapping>
+public class OrmEclipseLinkBasicMappingUiProvider
+	extends AbstractBasicMappingUiProvider<OrmEclipseLinkBasicMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmBasicMappingUiProvider();
+	private static final OrmEclipseLinkBasicMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkBasicMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmBasicMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkBasicMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmBasicMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicMappingUiProvider() {
+	private OrmEclipseLinkBasicMappingUiProvider() {
 		super();
 	}
 	
@@ -48,10 +48,10 @@ public class EclipseLinkOrmBasicMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmBasicMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkBasicMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		
-		return new EclipseLinkOrmBasicMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkBasicMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmCachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkCachingComposite.java
index f300a36c03..204ab0c1a8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkCachingComposite.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.CachingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkCachingComposite;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
@@ -35,20 +35,20 @@ import org.eclipse.swt.widgets.Composite;
  *
  * @see Entity
  * @see EclipseLinkCaching
- * @see EclipseLinkJavaEntityComposite - The parent container
- * @see CacheTypeComposite
- * @see CacheSizeComposite
- * @see AlwaysRefreshComposite
- * @see RefreshOnlyIfNewerComposite
- * @see DisableHitsComposite
+ * @see JavaEclipseLinkEntityComposite - The parent container
+ * @see EclipseLinkCacheTypeComposite
+ * @see EclipseLinkCacheSizeComposite
+ * @see EclipseLinkAlwaysRefreshComposite
+ * @see EclipseLinkRefreshOnlyIfNewerComposite
+ * @see EclipseLinkDisableHitsComposite
  *
  * @version 2.1
  * @since 2.1
  */
-public class OrmCachingComposite extends CachingComposite<EclipseLinkCaching>
+public class OrmEclipseLinkCachingComposite extends EclipseLinkCachingComposite<EclipseLinkCaching>
 {
 
-	public OrmCachingComposite(FormPane<?> parentPane,
+	public OrmEclipseLinkCachingComposite(FormPane<?> parentPane,
         PropertyValueModel<EclipseLinkCaching> subjectHolder,
         Composite parent) {
 
@@ -57,6 +57,6 @@ public class OrmCachingComposite extends CachingComposite<EclipseLinkCaching>
 
 	@Override
 	protected void initializeExistenceCheckingComposite(Composite parent) {
-		new OrmExistenceCheckingComposite(this, parent);
+		new OrmEclipseLinkExistenceCheckingComposite(this, parent);
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmConvertComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkConvertComposite.java
index 7f896b3781..55e6b4ccc6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmConvertComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkConvertComposite.java
@@ -51,7 +51,7 @@ import org.eclipse.swt.widgets.Composite;
 
 //Temporary to remove the Define Converters section from orm basic, id, version mapping.
 //This is supported in EclipseLink in version 1.1, but not 1.0
-public class OrmConvertComposite extends FormPane<EclipseLinkConvert>
+public class OrmEclipseLinkConvertComposite extends FormPane<EclipseLinkConvert>
 {
 
 	/**
@@ -70,7 +70,7 @@ public class OrmConvertComposite extends FormPane<EclipseLinkConvert>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public OrmConvertComposite(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder,
+	public OrmEclipseLinkConvertComposite(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 
@@ -81,7 +81,7 @@ public class OrmConvertComposite extends FormPane<EclipseLinkConvert>
 	protected void initializeLayout(Composite container) {
 		CCombo combo = addLabeledEditableCCombo(
 			container,
-			EclipseLinkUiMappingsMessages.ConvertComposite_converterNameLabel,
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertComposite_converterNameLabel,
 			buildConvertNameListHolder(),
 			buildConvertNameHolder(),
 			buildNameConverter(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/ConvertersComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkConvertersComposite.java
index f256bb37b7..f6c03747d0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/ConvertersComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkConvertersComposite.java
@@ -21,11 +21,11 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkStructConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTypeConverter;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.CustomConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.ObjectTypeConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.StructConverterComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.TypeConverterComposite;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkCustomConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkObjectTypeConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkStructConverterComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTypeConverterComposite;
 import org.eclipse.jpt.ui.internal.util.ControlSwitcher;
 import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
@@ -78,16 +78,16 @@ import org.eclipse.ui.part.PageBook;
  * @version 2.1
  * @since 2.1
  */
-public class ConvertersComposite extends Pane<EclipseLinkConverterHolder>
+public class OrmEclipseLinkConvertersComposite extends Pane<EclipseLinkConverterHolder>
 {
 	private AddRemoveListPane<EclipseLinkConverterHolder> listPane;
-	private CustomConverterComposite converterComposite;
-	private ObjectTypeConverterComposite objectTypeConverterComposite;
-	private StructConverterComposite structConverterComposite;
-	private TypeConverterComposite typeConverterComposite;
+	private EclipseLinkCustomConverterComposite converterComposite;
+	private EclipseLinkObjectTypeConverterComposite objectTypeConverterComposite;
+	private EclipseLinkStructConverterComposite structConverterComposite;
+	private EclipseLinkTypeConverterComposite typeConverterComposite;
 	private WritablePropertyValueModel<EclipseLinkConverter> selectedConverterHolder;
 
-	public ConvertersComposite(
+	public OrmEclipseLinkConvertersComposite(
 		FormPane<?> parentPane, 
 		PropertyValueModel<? extends EclipseLinkConverterHolder> subjectHolder,
 		Composite parent) {
@@ -115,28 +115,28 @@ public class ConvertersComposite extends Pane<EclipseLinkConverterHolder>
 		PageBook pageBook = new PageBook(container, SWT.NULL);
 		pageBook.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		this.converterComposite = new CustomConverterComposite(
+		this.converterComposite = new EclipseLinkCustomConverterComposite(
 			buildCustomConverterHolder(),
 			pageBook,
 			getWidgetFactory()
 		);
 		registerSubPane(this.converterComposite);
 		
-		this.objectTypeConverterComposite = new ObjectTypeConverterComposite(
+		this.objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(
 			buildObjectTypeConverterHolder(),
 			pageBook,
 			getWidgetFactory()
 		);
 		registerSubPane(this.objectTypeConverterComposite);
 		
-		this.structConverterComposite = new StructConverterComposite(
+		this.structConverterComposite = new EclipseLinkStructConverterComposite(
 			buildStructConverterHolder(),
 			pageBook,
 			getWidgetFactory()
 		);
 		registerSubPane(this.structConverterComposite);
 		
-		this.typeConverterComposite = new TypeConverterComposite(
+		this.typeConverterComposite = new EclipseLinkTypeConverterComposite(
 			buildTypeConverterHolder(),
 			pageBook,
 			getWidgetFactory()
@@ -241,16 +241,16 @@ public class ConvertersComposite extends Pane<EclipseLinkConverterHolder>
 				}
 
 				if (converter.getType() == EclipseLinkConverter.CUSTOM_CONVERTER) {
-					return ConvertersComposite.this.converterComposite.getControl();
+					return OrmEclipseLinkConvertersComposite.this.converterComposite.getControl();
 				}
 				if (converter.getType() == EclipseLinkConverter.OBJECT_TYPE_CONVERTER) {
-					return ConvertersComposite.this.objectTypeConverterComposite.getControl();
+					return OrmEclipseLinkConvertersComposite.this.objectTypeConverterComposite.getControl();
 				}
 				if (converter.getType() == EclipseLinkConverter.STRUCT_CONVERTER) {
-					return ConvertersComposite.this.structConverterComposite.getControl();
+					return OrmEclipseLinkConvertersComposite.this.structConverterComposite.getControl();
 				}
 				if (converter.getType() == EclipseLinkConverter.TYPE_CONVERTER) {
-					return ConvertersComposite.this.typeConverterComposite.getControl();
+					return OrmEclipseLinkConvertersComposite.this.typeConverterComposite.getControl();
 				}
 
 				return null;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddableComposite.java
index 10d877465a..75e0c389d9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddableComposite.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddable;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEmbeddableAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLinkOrmEmbeddableComposite extends FormPane<EclipseLinkOrmEmbeddable>
+public class OrmEclipseLinkEmbeddableComposite extends FormPane<OrmEclipseLinkEmbeddable>
                                  implements JpaComposite
 {
 	/**
@@ -44,7 +44,7 @@ public class EclipseLinkOrmEmbeddableComposite extends FormPane<EclipseLinkOrmEm
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkOrmEmbeddableComposite(PropertyValueModel<? extends EclipseLinkOrmEmbeddable> subjectHolder,
+	public OrmEclipseLinkEmbeddableComposite(PropertyValueModel<? extends OrmEclipseLinkEmbeddable> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -65,7 +65,7 @@ public class EclipseLinkOrmEmbeddableComposite extends FormPane<EclipseLinkOrmEm
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmEmbeddable, AccessHolder>(
+		return new PropertyAspectAdapter<OrmEclipseLinkEmbeddable, AccessHolder>(
 			getSubjectHolder())
 		{
 			@Override
@@ -79,14 +79,14 @@ public class EclipseLinkOrmEmbeddableComposite extends FormPane<EclipseLinkOrmEm
 
 		container = addCollapsableSection(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_Label
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_Label
 		);
 
-		new ConvertersComposite(this, buildConverterHolder(), container);
+		new OrmEclipseLinkConvertersComposite(this, buildConverterHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkConverterHolder> buildConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmEmbeddable, EclipseLinkConverterHolder>(getSubjectHolder()) {
+		return new PropertyAspectAdapter<OrmEclipseLinkEmbeddable, EclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
 			protected EclipseLinkConverterHolder buildValue_() {
 				return this.subject.getConverterHolder();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddableUiProvider.java
index d14553a5b2..448ef558a4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddableUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddableUiProvider.java
@@ -11,8 +11,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddable;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddableUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddableUiProvider 
-	extends AbstractEmbeddableUiProvider<EclipseLinkOrmEmbeddable>
+public class OrmEclipseLinkEmbeddableUiProvider 
+	extends AbstractEmbeddableUiProvider<OrmEclipseLinkEmbeddable>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddableUiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddableUiProvider();
+	private static final OrmEclipseLinkEmbeddableUiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddableUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmEmbeddable> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkEmbeddable> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmEmbeddableUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddableUiProvider() {
+	private OrmEclipseLinkEmbeddableUiProvider() {
 		super();
 	}
 	
@@ -49,9 +49,9 @@ public class EclipseLinkOrmEmbeddableUiProvider
 	
 	public JpaComposite buildPersistentTypeMappingComposite(
 			JpaUiFactory factory, 
-			PropertyValueModel<EclipseLinkOrmEmbeddable> subjectHolder, 
+			PropertyValueModel<OrmEclipseLinkEmbeddable> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmEmbeddableComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddedIdMappingUiProvider.java
index c395af16e5..afb006be92 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddedIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddedIdMappingUiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddedIdMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddedIdMappingUiProvider
+public class OrmEclipseLinkEmbeddedIdMappingUiProvider
 	extends AbstractEmbeddedIdMappingUiProvider<OrmEmbeddedIdMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddedIdMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddedIdMappingUiProvider();
+	private static final OrmEclipseLinkEmbeddedIdMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddedIdMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmEmbeddedIdMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddedIdMappingUiProvider() {
+	private OrmEclipseLinkEmbeddedIdMappingUiProvider() {
 		super();
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddedMappingUiProvider.java
index a1eeea0b32..f422a5128f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEmbeddedMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEmbeddedMappingUiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddedMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddedMappingUiProvider
+public class OrmEclipseLinkEmbeddedMappingUiProvider
 	extends AbstractEmbeddedMappingUiProvider<OrmEmbeddedMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddedMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddedMappingUiProvider();
+	private static final OrmEclipseLinkEmbeddedMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddedMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmEmbeddedMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddedMappingUiProvider() {
+	private OrmEclipseLinkEmbeddedMappingUiProvider() {
 		super();
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEntityComposite.java
index 5f16e25b2c..9ff4d7de06 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEntityComposite.java
@@ -13,8 +13,8 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.core.context.orm.OrmEntity;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEntity;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkEntity;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEntityAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -31,9 +31,9 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEntityComposite extends AbstractEntityComposite<OrmEntity>
+public class OrmEclipseLinkEntityComposite extends AbstractEntityComposite<OrmEntity>
 {
-	public EclipseLinkOrmEntityComposite(
+	public OrmEclipseLinkEntityComposite(
 			PropertyValueModel<? extends OrmEntity> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
 		super(subjectHolder, parent, widgetFactory);
@@ -80,14 +80,14 @@ public class EclipseLinkOrmEntityComposite extends AbstractEntityComposite<OrmEn
 		container = addCollapsableSection(
 			addSubPane(container, 5),
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching);
-		new OrmCachingComposite(this, buildCachingHolder(), container);
+		new OrmEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 	
 	private PropertyAspectAdapter<OrmEntity, EclipseLinkCaching> buildCachingHolder() {
 		return new PropertyAspectAdapter<OrmEntity, EclipseLinkCaching>(getSubjectHolder()) {
 			@Override
 			protected EclipseLinkCaching buildValue_() {
-				return ((EclipseLinkOrmEntity) this.subject).getCaching();
+				return ((OrmEclipseLinkEntity) this.subject).getCaching();
 			}
 		};
 	}
@@ -106,17 +106,17 @@ public class EclipseLinkOrmEntityComposite extends AbstractEntityComposite<OrmEn
 
 		container = addCollapsableSection(
 			container,
-			EclipseLinkUiMappingsMessages.ConvertersComposite_Label
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_Label
 		);
 
-		new ConvertersComposite(this, buildConverterHolder(), container);
+		new OrmEclipseLinkConvertersComposite(this, buildConverterHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkConverterHolder> buildConverterHolder() {
 		return new PropertyAspectAdapter<OrmEntity, EclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
 			protected EclipseLinkConverterHolder buildValue_() {
-				return ((EclipseLinkOrmEntity) this.subject).getConverterHolder();
+				return ((OrmEclipseLinkEntity) this.subject).getConverterHolder();
 			}
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEntityUiProvider.java
index bcdc7fbfb3..d5c51dc311 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmEntityUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkEntityUiProvider.java
@@ -11,8 +11,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkEntity;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEntity;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractEntityUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEntityUiProvider 
-	extends AbstractEntityUiProvider<EclipseLinkOrmEntity>
+public class OrmEclipseLinkEntityUiProvider 
+	extends AbstractEntityUiProvider<OrmEclipseLinkEntity>
 {
 	// singleton
-	private static final EclipseLinkOrmEntityUiProvider INSTANCE = 
-		new EclipseLinkOrmEntityUiProvider();
+	private static final OrmEclipseLinkEntityUiProvider INSTANCE = 
+		new OrmEclipseLinkEntityUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmEntity> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkEntity> instance() {
 		return INSTANCE;
 	}
 	
@@ -42,16 +42,16 @@ public class EclipseLinkOrmEntityUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEntityUiProvider() {
+	private OrmEclipseLinkEntityUiProvider() {
 		super();
 	}
 	
 	
 	public JpaComposite buildPersistentTypeMappingComposite(
 			JpaUiFactory factory, 
-			PropertyValueModel<EclipseLinkOrmEntity> subjectHolder, 
+			PropertyValueModel<OrmEclipseLinkEntity> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmEntityComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmExistenceCheckingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkExistenceCheckingComposite.java
index 33af2073f1..211c5aa37b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmExistenceCheckingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkExistenceCheckingComposite.java
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class OrmExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
+public class OrmEclipseLinkExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
 
 	/**
 	 * Creates a new <code>ExistenceCheckingComposite</code>.
@@ -39,7 +39,7 @@ public class OrmExistenceCheckingComposite extends FormPane<EclipseLinkCaching>
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public OrmExistenceCheckingComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public OrmEclipseLinkExistenceCheckingComposite(FormPane<? extends EclipseLinkCaching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent, false);
@@ -50,7 +50,7 @@ public class OrmExistenceCheckingComposite extends FormPane<EclipseLinkCaching>
 
 		addLabeledComposite( 
             container, 
-            EclipseLinkUiMappingsMessages.ExistenceCheckingComposite_label,
+            EclipseLinkUiMappingsMessages.EclipseLinkExistenceCheckingComposite_label,
             addExistenceCheckingTypeCombo(container).getControl(), 
             null 
        );
@@ -81,7 +81,7 @@ public class OrmExistenceCheckingComposite extends FormPane<EclipseLinkCaching>
 			protected String displayString(EclipseLinkExistenceType value) {
 				return buildDisplayString(
 					EclipseLinkUiMappingsMessages.class,
-					OrmExistenceCheckingComposite.this,
+					OrmEclipseLinkExistenceCheckingComposite.this,
 					value
 				);
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkIdMappingComposite.java
index 739d6e1816..d96ad69d09 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkIdMappingComposite.java
@@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Composite;
 
 //Removing the Converters section from EclipseLink 1.0 orm basic mapping.
 //This is supported in EclipseLink in version 1.1, but not 1.0
-public class EclipseLinkOrmIdMappingComposite extends EclipseLinkIdMappingComposite
+public class OrmEclipseLinkIdMappingComposite extends EclipseLinkIdMappingComposite
 {
 	/**
 	 * Creates a new <code>EclipseLinkOrmIdMappingComposite</code>.
@@ -28,7 +28,7 @@ public class EclipseLinkOrmIdMappingComposite extends EclipseLinkIdMappingCompos
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkOrmIdMappingComposite(PropertyValueModel<? extends IdMapping> subjectHolder,
+	public OrmEclipseLinkIdMappingComposite(PropertyValueModel<? extends IdMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -38,6 +38,6 @@ public class EclipseLinkOrmIdMappingComposite extends EclipseLinkIdMappingCompos
 	@Override
 	//everything but the 'Define Converter' section.  This is not supported in eclipselink 1.0, but is in 1.1
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new OrmConvertComposite(convertHolder, container, getWidgetFactory());
+		return new OrmEclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkIdMappingUiProvider.java
index 463e4f4521..5fb695e7f5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmIdMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkIdMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkIdMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractIdMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmIdMappingUiProvider
-	extends AbstractIdMappingUiProvider<EclipseLinkOrmIdMapping>
+public class OrmEclipseLinkIdMappingUiProvider
+	extends AbstractIdMappingUiProvider<OrmEclipseLinkIdMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmIdMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmIdMappingUiProvider();
+	private static final OrmEclipseLinkIdMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkIdMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmIdMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkIdMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmIdMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmIdMappingUiProvider() {
+	private OrmEclipseLinkIdMappingUiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmIdMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmIdMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkIdMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmIdMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkIdMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkManyToManyMappingUiProvider.java
index 0dd6c27a79..8712594d58 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkManyToManyMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkManyToManyMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToManyMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractManyToManyMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmManyToManyMappingUiProvider
-	extends AbstractManyToManyMappingUiProvider<EclipseLinkOrmManyToManyMapping>
+public class OrmEclipseLinkManyToManyMappingUiProvider
+	extends AbstractManyToManyMappingUiProvider<OrmEclipseLinkManyToManyMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmManyToManyMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmManyToManyMappingUiProvider();
+	private static final OrmEclipseLinkManyToManyMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkManyToManyMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmManyToManyMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkManyToManyMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmManyToManyMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmManyToManyMappingUiProvider() {
+	private OrmEclipseLinkManyToManyMappingUiProvider() {
 		super();
 	}
 	
@@ -49,7 +49,7 @@ public class EclipseLinkOrmManyToManyMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkManyToManyMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		return new EclipseLinkManyToManyMappingComposite(subjectHolder, parent, widgetFactory);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkManyToOneMappingUiProvider.java
index 37de5db03a..c6211411e3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmManyToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkManyToOneMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkManyToOneMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractManyToOneMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmManyToOneMappingUiProvider
-	extends AbstractManyToOneMappingUiProvider<EclipseLinkOrmManyToOneMapping>
+public class OrmEclipseLinkManyToOneMappingUiProvider
+	extends AbstractManyToOneMappingUiProvider<OrmEclipseLinkManyToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmManyToOneMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmManyToOneMappingUiProvider();
+	private static final OrmEclipseLinkManyToOneMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkManyToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmManyToOneMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkManyToOneMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmManyToOneMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmManyToOneMappingUiProvider() {
+	private OrmEclipseLinkManyToOneMappingUiProvider() {
 		super();
 	}
 	
@@ -49,7 +49,7 @@ public class EclipseLinkOrmManyToOneMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmManyToOneMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkManyToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		return new EclipseLinkManyToOneMappingComposite(subjectHolder, parent, widgetFactory);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkMappedSuperclassComposite.java
index d33eef1e7a..8b2e0f8c03 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkMappedSuperclassComposite.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.jpt.core.context.AccessHolder;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmMappedSuperclass;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMappedSuperclassAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -27,10 +27,10 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmMappedSuperclassComposite extends FormPane<EclipseLinkOrmMappedSuperclass> implements JpaComposite
+public class OrmEclipseLinkMappedSuperclassComposite extends FormPane<OrmEclipseLinkMappedSuperclass> implements JpaComposite
 {
-	public EclipseLinkOrmMappedSuperclassComposite(
-			PropertyValueModel<? extends EclipseLinkOrmMappedSuperclass> subjectHolder,
+	public OrmEclipseLinkMappedSuperclassComposite(
+			PropertyValueModel<? extends OrmEclipseLinkMappedSuperclass> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
 		super(subjectHolder, parent, widgetFactory);
 	}
@@ -52,7 +52,7 @@ public class EclipseLinkOrmMappedSuperclassComposite extends FormPane<EclipseLin
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, AccessHolder>(
+		return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, AccessHolder>(
 			getSubjectHolder())
 		{
 			@Override
@@ -69,11 +69,11 @@ public class EclipseLinkOrmMappedSuperclassComposite extends FormPane<EclipseLin
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching
 		);
 
-		new OrmCachingComposite(this, buildCachingHolder(), container);
+		new OrmEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkCaching>(
+	private PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, EclipseLinkCaching> buildCachingHolder() {
+		return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, EclipseLinkCaching>(
 			getSubjectHolder())
 		{
 			@Override
@@ -87,14 +87,14 @@ public class EclipseLinkOrmMappedSuperclassComposite extends FormPane<EclipseLin
 
 		container = addCollapsableSection(
 			container,
-			EclipseLinkUiMappingsMessages.ConvertersComposite_Label
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_Label
 		);
 
-		new ConvertersComposite(this, buildConverterHolder(), container);
+		new OrmEclipseLinkConvertersComposite(this, buildConverterHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkConverterHolder> buildConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkConverterHolder>(getSubjectHolder()) {
+		return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, EclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
 			protected EclipseLinkConverterHolder buildValue_() {
 				return this.subject.getConverterHolder();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmMappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkMappedSuperclassUiProvider.java
index 5bed698450..9cb6dc0671 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmMappedSuperclassUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkMappedSuperclassUiProvider.java
@@ -11,8 +11,8 @@
 package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmMappedSuperclass;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractMappedSuperclassUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmMappedSuperclassUiProvider 
-	extends AbstractMappedSuperclassUiProvider<EclipseLinkOrmMappedSuperclass>
+public class OrmEclipseLinkMappedSuperclassUiProvider 
+	extends AbstractMappedSuperclassUiProvider<OrmEclipseLinkMappedSuperclass>
 {
 	// singleton
-	private static final EclipseLinkOrmMappedSuperclassUiProvider INSTANCE = 
-		new EclipseLinkOrmMappedSuperclassUiProvider();
+	private static final OrmEclipseLinkMappedSuperclassUiProvider INSTANCE = 
+		new OrmEclipseLinkMappedSuperclassUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmMappedSuperclass> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkMappedSuperclass> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmMappedSuperclassUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmMappedSuperclassUiProvider() {
+	private OrmEclipseLinkMappedSuperclassUiProvider() {
 		super();
 	}
 	
@@ -47,7 +47,7 @@ public class EclipseLinkOrmMappedSuperclassUiProvider
 		return JptEclipseLinkCorePlugin.ECLIPSELINK_ORM_XML_CONTENT_TYPE;
 	}
 
-	public JpaComposite buildPersistentTypeMappingComposite(JpaUiFactory factory, PropertyValueModel<EclipseLinkOrmMappedSuperclass> subjectHolder, Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildPersistentTypeMappingComposite(JpaUiFactory factory, PropertyValueModel<OrmEclipseLinkMappedSuperclass> subjectHolder, Composite parent, WidgetFactory widgetFactory) {
+		return new OrmEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkOneToManyMappingUiProvider.java
index b53b480383..e7fc01c505 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToManyMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkOneToManyMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkOneToManyMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkOneToManyMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractOneToManyMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmOneToManyMappingUiProvider
-	extends AbstractOneToManyMappingUiProvider<EclipseLinkOrmOneToManyMapping>
+public class OrmEclipseLinkOneToManyMappingUiProvider
+	extends AbstractOneToManyMappingUiProvider<OrmEclipseLinkOneToManyMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmOneToManyMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmOneToManyMappingUiProvider();
+	private static final OrmEclipseLinkOneToManyMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkOneToManyMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmOneToManyMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkOneToManyMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmOneToManyMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmOneToManyMappingUiProvider() {
+	private OrmEclipseLinkOneToManyMappingUiProvider() {
 		super();
 	}
 	
@@ -49,7 +49,7 @@ public class EclipseLinkOrmOneToManyMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmOneToManyMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkOneToManyMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		return new EclipseLinkOneToManyMappingComposite(subjectHolder, parent, widgetFactory);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkOneToOneMappingUiProvider.java
index 117110c4be..fd682a4714 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkOneToOneMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkOneToOneMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkOneToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -21,17 +21,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractOneToOneMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmOneToOneMappingUiProvider
-	extends AbstractOneToOneMappingUiProvider<EclipseLinkOrmOneToOneMapping>
+public class OrmEclipseLinkOneToOneMappingUiProvider
+	extends AbstractOneToOneMappingUiProvider<OrmEclipseLinkOneToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmOneToOneMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmOneToOneMappingUiProvider();
+	private static final OrmEclipseLinkOneToOneMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkOneToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmOneToOneMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkOneToOneMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -39,7 +39,7 @@ public class EclipseLinkOrmOneToOneMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmOneToOneMappingUiProvider() {
+	private OrmEclipseLinkOneToOneMappingUiProvider() {
 		super();
 	}
 	
@@ -49,7 +49,7 @@ public class EclipseLinkOrmOneToOneMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmOneToOneMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		return new EclipseLinkOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmTransformationMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkTransformationMappingUiProvider.java
index dab39dcd01..dc10e5afa3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmTransformationMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkTransformationMappingUiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTransformationMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.TransformationMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmTransformationMappingUiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
+public class OrmEclipseLinkTransformationMappingUiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmTransformationMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmTransformationMappingUiProvider();
+	private static final OrmEclipseLinkTransformationMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkTransformationMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmTransformationMappingUiProvider extends EclipseLinkTr
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmTransformationMappingUiProvider() {
+	private OrmEclipseLinkTransformationMappingUiProvider() {
 		super();
 	}
 	
@@ -52,6 +52,6 @@ public class EclipseLinkOrmTransformationMappingUiProvider extends EclipseLinkTr
 		Composite parent,
 		WidgetFactory widgetFactory) {
 		
-		return new TransformationMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkTransformationMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmTransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkTransientMappingUiProvider.java
index 47dd82a524..26e2eb8d9d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmTransientMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkTransientMappingUiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractTransientMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmTransientMappingUiProvider
+public class OrmEclipseLinkTransientMappingUiProvider
 	extends AbstractTransientMappingUiProvider<OrmTransientMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmTransientMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmTransientMappingUiProvider();
+	private static final OrmEclipseLinkTransientMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkTransientMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmTransientMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmTransientMappingUiProvider() {
+	private OrmEclipseLinkTransientMappingUiProvider() {
 		super();
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVariableOneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVariableOneToOneMappingUiProvider.java
index 8b1f1277fb..403be5cc29 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVariableOneToOneMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVariableOneToOneMappingUiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVariableOneToOneMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.VariableOneToOneMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmVariableOneToOneMappingUiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
+public class OrmEclipseLinkVariableOneToOneMappingUiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmVariableOneToOneMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmVariableOneToOneMappingUiProvider();
+	private static final OrmEclipseLinkVariableOneToOneMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkVariableOneToOneMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmVariableOneToOneMappingUiProvider extends EclipseLink
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmVariableOneToOneMappingUiProvider() {
+	private OrmEclipseLinkVariableOneToOneMappingUiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkOrmVariableOneToOneMappingUiProvider extends EclipseLink
 			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new VariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVersionMappingComposite.java
index c90e95c025..9b587a3e7c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVersionMappingComposite.java
@@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 
 //Temporary to remove the Converters section from orm basic mapping.
 //This is supported in EclipseLink in version 1.1, but not 1.0
-public class EclipseLinkOrmVersionMappingComposite extends EclipseLinkVersionMappingComposite implements JpaComposite
+public class OrmEclipseLinkVersionMappingComposite extends EclipseLinkVersionMappingComposite implements JpaComposite
 {
 	/**
 	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
@@ -29,7 +29,7 @@ public class EclipseLinkOrmVersionMappingComposite extends EclipseLinkVersionMap
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLinkOrmVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
+	public OrmEclipseLinkVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -40,6 +40,6 @@ public class EclipseLinkOrmVersionMappingComposite extends EclipseLinkVersionMap
 	@Override
 	//everything but the 'Defaine Converter' section.  This is not supported in eclipselink 1.0, but is in 1.1
 	protected Pane<EclipseLinkConvert> buildConvertComposite(PropertyValueModel<EclipseLinkConvert> convertHolder, Composite container) {
-		return new OrmConvertComposite(convertHolder, container, getWidgetFactory());
+		return new OrmEclipseLinkConvertComposite(convertHolder, container, getWidgetFactory());
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVersionMappingUiProvider.java
index 0aa08dbfcf..b0d12e9682 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/EclipseLinkOrmVersionMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/orm/details/OrmEclipseLinkVersionMappingUiProvider.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.orm.details;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmVersionMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkVersionMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractVersionMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmVersionMappingUiProvider
-	extends AbstractVersionMappingUiProvider<EclipseLinkOrmVersionMapping>
+public class OrmEclipseLinkVersionMappingUiProvider
+	extends AbstractVersionMappingUiProvider<OrmEclipseLinkVersionMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmVersionMappingUiProvider INSTANCE = 
-		new EclipseLinkOrmVersionMappingUiProvider();
+	private static final OrmEclipseLinkVersionMappingUiProvider INSTANCE = 
+		new OrmEclipseLinkVersionMappingUiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmVersionMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkVersionMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmVersionMappingUiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmVersionMappingUiProvider() {
+	private OrmEclipseLinkVersionMappingUiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmVersionMappingUiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmVersionMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkVersionMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmVersionMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkVersionMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java
index 4d9af8e04a..e674a16a09 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java
@@ -11,31 +11,31 @@ package org.eclipse.jpt.eclipselink.ui.internal.platform;
 
 import java.util.List;
 import org.eclipse.jpt.core.context.AttributeMapping;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultOneToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultEclipseLinkVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaBasicCollectionMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaBasicMapMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.EclipseLinkJavaVariableOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultJavaEclipseLinkOneToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultJavaEclipseLinkOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkBasicCollectionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkBasicMapMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkTransformationMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkVariableOneToOneMappingUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkEntityMappingsDetailsProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmBasicCollectionMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmBasicMapMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmBasicMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEmbeddableUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEmbeddedIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEmbeddedMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEntityUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmIdMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmManyToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmManyToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmMappedSuperclassUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmOneToManyMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmTransientMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmVersionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkBasicCollectionMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkBasicMapMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkBasicMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEmbeddableUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEmbeddedIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEmbeddedMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEntityUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkIdMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkManyToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkManyToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkMappedSuperclassUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkOneToManyMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkTransformationMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkTransientMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkVariableOneToOneMappingUiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkVersionMappingUiProvider;
 import org.eclipse.jpt.eclipselink.ui.internal.structure.EclipseLinkOrmResourceModelStructureProvider;
 import org.eclipse.jpt.ui.JpaPlatformUiProvider;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -87,9 +87,9 @@ public class EclipseLinkJpaPlatformUiProvider extends AbstractJpaPlatformUiProvi
 
 	@Override
 	protected void addTypeMappingUiProvidersTo(List<TypeMappingUiProvider<?>> providers) {
-		providers.add(EclipseLinkOrmEntityUiProvider.instance());
-		providers.add(EclipseLinkOrmMappedSuperclassUiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddableUiProvider.instance());
+		providers.add(OrmEclipseLinkEntityUiProvider.instance());
+		providers.add(OrmEclipseLinkMappedSuperclassUiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddableUiProvider.instance());
 	}
 	
 	@Override
@@ -102,31 +102,31 @@ public class EclipseLinkJpaPlatformUiProvider extends AbstractJpaPlatformUiProvi
 	
 	@Override
 	protected void addAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) {
-		providers.add(EclipseLinkJavaBasicCollectionMappingUiProvider.instance());
-		providers.add(EclipseLinkJavaBasicMapMappingUiProvider.instance());
-		providers.add(EclipseLinkJavaVariableOneToOneMappingUiProvider.instance());
-		providers.add(EclipseLinkJavaTransformationMappingUiProvider.instance());
+		providers.add(JavaEclipseLinkBasicCollectionMappingUiProvider.instance());
+		providers.add(JavaEclipseLinkBasicMapMappingUiProvider.instance());
+		providers.add(JavaEclipseLinkVariableOneToOneMappingUiProvider.instance());
+		providers.add(JavaEclipseLinkTransformationMappingUiProvider.instance());
 		
-		providers.add(EclipseLinkOrmIdMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedIdMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmBasicMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmBasicCollectionMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmBasicMapMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmVersionMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmManyToOneMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmOneToManyMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmOneToOneMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmVariableOneToOneMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmManyToManyMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmTransformationMappingUiProvider.instance());
-		providers.add(EclipseLinkOrmTransientMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkIdMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddedIdMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkBasicMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkBasicCollectionMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkBasicMapMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkVersionMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkManyToOneMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkOneToManyMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddedMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkOneToOneMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkVariableOneToOneMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkManyToManyMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkTransformationMappingUiProvider.instance());
+		providers.add(OrmEclipseLinkTransientMappingUiProvider.instance());
 	}
 
 	@Override
 	protected void addDefaultAttributeMappingUiProvidersTo(List<DefaultAttributeMappingUiProvider<? extends AttributeMapping>> providers) {
-		providers.add(DefaultOneToOneMappingUiProvider.instance());
-		providers.add(DefaultOneToManyMappingUiProvider.instance());
-		providers.add(DefaultEclipseLinkVariableOneToOneMappingUiProvider.instance());
+		providers.add(DefaultJavaEclipseLinkOneToOneMappingUiProvider.instance());
+		providers.add(DefaultJavaEclipseLinkOneToManyMappingUiProvider.instance());
+		providers.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiProvider.instance());
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
index c64dd797cd..b634885b79 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/EclipseLink1_1JpaUiFactory.java
@@ -13,9 +13,9 @@ 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.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.eclipselink.ui.internal.v1_1.java.details.JavaEclipseLinkEmbeddable1_1Composite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.JavaEclipseLinkEntity1_1Composite;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.java.details.JavaEclipseLinkMappedSuperclass1_1Composite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -35,20 +35,20 @@ public class EclipseLink1_1JpaUiFactory extends EclipseLinkJpaUiFactory //TODO j
 	public JpaComposite createJavaMappedSuperclassComposite(
 			PropertyValueModel<JavaMappedSuperclass> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLink1_1JavaMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkMappedSuperclass1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 	
 	@Override
 	public JpaComposite createJavaEntityComposite(
 			PropertyValueModel<JavaEntity> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLink1_1JavaEntityComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEntity1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 	
 	@Override
 	public JpaComposite createJavaEmbeddableComposite(
 			PropertyValueModel<JavaEmbeddable> subjectHolder,
 			Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLink1_1JavaEmbeddableComposite(subjectHolder, parent, widgetFactory);
+		return new JavaEclipseLinkEmbeddable1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkEmbeddable1_1Composite.java
index 07a4d30adf..cc17a0cba9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkEmbeddable1_1Composite.java
@@ -11,9 +11,9 @@ 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;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEmbeddable;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.ConvertersComposite;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkEmbeddable;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkConvertersComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEmbeddableAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLink1_1JavaEmbeddableComposite extends FormPane<JavaEmbeddable>
+public class JavaEclipseLinkEmbeddable1_1Composite extends FormPane<JavaEmbeddable>
                                  implements JpaComposite
 {
 	/**
@@ -44,7 +44,7 @@ public class EclipseLink1_1JavaEmbeddableComposite extends FormPane<JavaEmbeddab
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1JavaEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
+	public JavaEclipseLinkEmbeddable1_1Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -80,14 +80,14 @@ public class EclipseLink1_1JavaEmbeddableComposite extends FormPane<JavaEmbeddab
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaEmbeddable, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaEmbeddable, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaEmbeddable) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkEmbeddable) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkEntity1_1Composite.java
index e988665cce..4c8e5f4282 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkEntity1_1Composite.java
@@ -11,11 +11,11 @@ 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;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.ConvertersComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaCachingComposite;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkEntity;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkConvertersComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkCachingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEntityAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -33,13 +33,13 @@ import org.eclipse.swt.widgets.Composite;
 /**
  * The pane used for an EclipseLink1.1 Java entity.
  *
- * @see EclipseLinkJavaEntity
+ * @see JavaEclipseLinkEntity
  * @see EclipselinkJpaUiFactory - The factory creating this pane
  *
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1JavaEntityComposite extends AbstractEntityComposite<JavaEntity>
+public class JavaEclipseLinkEntity1_1Composite extends AbstractEntityComposite<JavaEntity>
 {
 	/**
 	 * Creates a new <code>EclipseLinkJavaEntityComposite</code>.
@@ -48,7 +48,7 @@ public class EclipseLink1_1JavaEntityComposite extends AbstractEntityComposite<J
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1JavaEntityComposite(PropertyValueModel<? extends JavaEntity> subjectHolder,
+	public JavaEclipseLinkEntity1_1Composite(PropertyValueModel<? extends JavaEntity> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -97,16 +97,16 @@ public class EclipseLink1_1JavaEntityComposite extends AbstractEntityComposite<J
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching
 		);
 
-		new JavaCachingComposite(this, buildCachingHolder(), container);
+		new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<JavaEntity, EclipseLinkJavaCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<JavaEntity, EclipseLinkJavaCaching>(
+	private PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching> buildCachingHolder() {
+		return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkJavaCaching buildValue_() {
-				return ((EclipseLinkJavaEntity) this.subject).getCaching();
+			protected JavaEclipseLinkCaching buildValue_() {
+				return ((JavaEclipseLinkEntity) this.subject).getCaching();
 			}
 		};
 		
@@ -119,14 +119,14 @@ public class EclipseLink1_1JavaEntityComposite extends AbstractEntityComposite<J
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaEntity, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaEntity) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkEntity) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkMappedSuperclass1_1Composite.java
index 5fa26fbe8d..0d70adfa3f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/EclipseLink1_1JavaMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/java/details/JavaEclipseLinkMappedSuperclass1_1Composite.java
@@ -11,11 +11,11 @@ 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;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaCaching;
-import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaConverterHolder;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.ConvertersComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaCachingComposite;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
+import org.eclipse.jpt.eclipselink.core.context.java.JavaEclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkConvertersComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.java.details.JavaEclipseLinkCachingComposite;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMappedSuperclassAdvancedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLink1_1JavaMappedSuperclassComposite extends FormPane<JavaMappedSuperclass>
+public class JavaEclipseLinkMappedSuperclass1_1Composite extends FormPane<JavaMappedSuperclass>
                                        implements JpaComposite
 {
 	/**
@@ -46,7 +46,7 @@ public class EclipseLink1_1JavaMappedSuperclassComposite extends FormPane<JavaMa
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1JavaMappedSuperclassComposite(PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
+	public JavaEclipseLinkMappedSuperclass1_1Composite(PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
@@ -85,16 +85,16 @@ public class EclipseLink1_1JavaMappedSuperclassComposite extends FormPane<JavaMa
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_caching
 		);
 
-		new JavaCachingComposite(this, buildCachingHolder(), container);
+		new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaCaching>(
+	private PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching> buildCachingHolder() {
+		return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkJavaCaching buildValue_() {
-				return ((EclipseLinkJavaMappedSuperclass) this.subject).getCaching();
+			protected JavaEclipseLinkCaching buildValue_() {
+				return ((JavaEclipseLinkMappedSuperclass) this.subject).getCaching();
 			}
 		};
 	}
@@ -105,14 +105,14 @@ public class EclipseLink1_1JavaMappedSuperclassComposite extends FormPane<JavaMa
 			EclipseLinkUiMappingsMessages.EclipseLinkTypeMappingComposite_converters
 		);
 
-		new ConvertersComposite(this, buildConverterHolderValueModel(), container);
+		new JavaEclipseLinkConvertersComposite(this, buildConverterHolderValueModel(), container);
 	}
 
-	protected PropertyValueModel<EclipseLinkJavaConverterHolder> buildConverterHolderValueModel() {
-		return new PropertyAspectAdapter<JavaMappedSuperclass, EclipseLinkJavaConverterHolder>(getSubjectHolder()) {
+	protected PropertyValueModel<JavaEclipseLinkConverterHolder> buildConverterHolderValueModel() {
+		return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
-			protected EclipseLinkJavaConverterHolder buildValue_() {
-				return ((EclipseLinkJavaMappedSuperclass) this.subject).getConverterHolder();
+			protected JavaEclipseLinkConverterHolder buildValue_() {
+				return ((JavaEclipseLinkMappedSuperclass) this.subject).getConverterHolder();
 			}	
 		};
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicCollectionMapping1_1Composite.java
index 10c8b905b1..6a5a24ff1e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicCollectionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicCollectionMapping1_1Composite.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmBasicCollectionMappingComposite extends FormPane<EclipseLinkBasicCollectionMapping>
+public class OrmEclipseLinkBasicCollectionMapping1_1Composite extends FormPane<EclipseLinkBasicCollectionMapping>
                                        implements JpaComposite
 {
 	/**
@@ -34,7 +34,7 @@ public class EclipseLink1_1OrmBasicCollectionMappingComposite extends FormPane<E
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmBasicCollectionMappingComposite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
+	public OrmEclipseLinkBasicCollectionMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicCollectionMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicCollectionMapping1_1UiProvider.java
index c575b362f1..f7450d8323 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicCollectionMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicCollectionMapping1_1UiProvider.java
@@ -20,11 +20,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicCollectionMapping1_1UiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
+public class OrmEclipseLinkBasicCollectionMapping1_1UiProvider extends EclipseLinkBasicCollectionMappingUiProvider<EclipseLinkBasicCollectionMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicCollectionMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmBasicCollectionMapping1_1UiProvider();
+	private static final OrmEclipseLinkBasicCollectionMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkBasicCollectionMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -37,7 +37,7 @@ public class EclipseLinkOrmBasicCollectionMapping1_1UiProvider extends EclipseLi
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicCollectionMapping1_1UiProvider() {
+	private OrmEclipseLinkBasicCollectionMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -50,6 +50,6 @@ public class EclipseLinkOrmBasicCollectionMapping1_1UiProvider extends EclipseLi
 			PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmBasicCollectionMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkBasicCollectionMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapMapping1_1Composite.java
index c10579e360..a4142b43cc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMapMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapMapping1_1Composite.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmBasicMapMappingComposite extends FormPane<EclipseLinkBasicMapMapping>
+public class OrmEclipseLinkBasicMapMapping1_1Composite extends FormPane<EclipseLinkBasicMapMapping>
                                        implements JpaComposite
 {
 	/**
@@ -34,7 +34,7 @@ public class EclipseLink1_1OrmBasicMapMappingComposite extends FormPane<EclipseL
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmBasicMapMappingComposite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
+	public OrmEclipseLinkBasicMapMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicMapMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapMapping1_1UiProvider.java
index 3185b3be56..7f0f04f4d6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicMapMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapMapping1_1UiProvider.java
@@ -20,11 +20,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicMapMapping1_1UiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
+public class OrmEclipseLinkBasicMapMapping1_1UiProvider extends EclipseLinkBasicMapMappingUiProvider<EclipseLinkBasicMapMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicMapMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmBasicMapMapping1_1UiProvider();
+	private static final OrmEclipseLinkBasicMapMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkBasicMapMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -37,7 +37,7 @@ public class EclipseLinkOrmBasicMapMapping1_1UiProvider extends EclipseLinkBasic
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicMapMapping1_1UiProvider() {
+	private OrmEclipseLinkBasicMapMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -50,6 +50,6 @@ public class EclipseLinkOrmBasicMapMapping1_1UiProvider extends EclipseLinkBasic
 			PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmBasicMapMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkBasicMapMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapping1_1Composite.java
index 187b754c60..6b2f6c88ee 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapping1_1Composite.java
@@ -12,7 +12,7 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkBasicMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.MutableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMutableComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.ColumnComposite;
@@ -22,7 +22,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLink1_1OrmBasicMappingComposite extends EclipseLinkBasicMappingComposite
+public class OrmEclipseLinkBasicMapping1_1Composite extends EclipseLinkBasicMappingComposite
 {
 	/**
 	 * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>.
@@ -31,7 +31,7 @@ public class EclipseLink1_1OrmBasicMappingComposite extends EclipseLinkBasicMapp
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder,
+	public OrmEclipseLinkBasicMapping1_1Composite(PropertyValueModel<? extends BasicMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -52,7 +52,7 @@ public class EclipseLink1_1OrmBasicMappingComposite extends EclipseLinkBasicMapp
 		new OptionalComposite(this, addSubPane(container, 4));
 		
 		// Mutable widgets
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapping1_1UiProvider.java
index 5c9a81de7e..b46d938617 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmBasicMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkBasicMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmBasicMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractBasicMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmBasicMapping1_1UiProvider
-	extends AbstractBasicMappingUiProvider<EclipseLinkOrmBasicMapping>
+public class OrmEclipseLinkBasicMapping1_1UiProvider
+	extends AbstractBasicMappingUiProvider<OrmEclipseLinkBasicMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmBasicMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmBasicMapping1_1UiProvider();
+	private static final OrmEclipseLinkBasicMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkBasicMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmBasicMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkBasicMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmBasicMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmBasicMapping1_1UiProvider() {
+	private OrmEclipseLinkBasicMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,10 +48,10 @@ public class EclipseLinkOrmBasicMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmBasicMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkBasicMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
 		
-		return new EclipseLink1_1OrmBasicMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkBasicMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddable1_1Composite.java
index 26d6057075..a784602419 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddable1_1Composite.java
@@ -10,11 +10,11 @@
 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.EclipseLinkConverterHolder;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddable;
+import org.eclipse.jpt.eclipselink.core.context.orm.EclipseLinkConverterHolder;
+import org.eclipse.jpt.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkEmbeddableAdvancedComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.ConvertersComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkConvertersComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
@@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class EclipseLink1_1OrmEmbeddableComposite extends FormPane<EclipseLinkOrmEmbeddable>
+public class OrmEclipseLinkEmbeddable1_1Composite extends FormPane<OrmEclipseLinkEmbeddable>
                                  implements JpaComposite
 {
 	/**
@@ -45,7 +45,7 @@ public class EclipseLink1_1OrmEmbeddableComposite extends FormPane<EclipseLinkOr
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmEmbeddableComposite(PropertyValueModel<? extends EclipseLinkOrmEmbeddable> subjectHolder,
+	public OrmEclipseLinkEmbeddable1_1Composite(PropertyValueModel<? extends OrmEclipseLinkEmbeddable> subjectHolder,
 	                           Composite parent,
 	                           WidgetFactory widgetFactory) {
 
@@ -66,7 +66,7 @@ public class EclipseLink1_1OrmEmbeddableComposite extends FormPane<EclipseLinkOr
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmEmbeddable, AccessHolder>(
+		return new PropertyAspectAdapter<OrmEclipseLinkEmbeddable, AccessHolder>(
 			getSubjectHolder())
 		{
 			@Override
@@ -80,14 +80,14 @@ public class EclipseLink1_1OrmEmbeddableComposite extends FormPane<EclipseLinkOr
 
 		container = addCollapsableSection(
 			addSubPane(container, 5),
-			EclipseLinkUiMappingsMessages.ConvertersComposite_Label
+			EclipseLinkUiMappingsMessages.EclipseLinkConvertersComposite_Label
 		);
 
-		new ConvertersComposite(this, buildConverterHolder(), container);
+		new OrmEclipseLinkConvertersComposite(this, buildConverterHolder(), container);
 	}
 	
 	private PropertyValueModel<EclipseLinkConverterHolder> buildConverterHolder() {
-		return new PropertyAspectAdapter<EclipseLinkOrmEmbeddable, EclipseLinkConverterHolder>(getSubjectHolder()) {
+		return new PropertyAspectAdapter<OrmEclipseLinkEmbeddable, EclipseLinkConverterHolder>(getSubjectHolder()) {
 			@Override
 			protected EclipseLinkConverterHolder buildValue_() {
 				return this.subject.getConverterHolder();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddable1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddable1_1UiProvider.java
index 8f257e120e..e5aaada83d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddable1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddable1_1UiProvider.java
@@ -11,9 +11,9 @@
 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.orm.OrmEclipseLinkEmbeddable;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEmbeddable;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEmbeddableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEmbeddableComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -22,17 +22,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddableUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddable1_1UiProvider 
-	extends AbstractEmbeddableUiProvider<EclipseLinkOrmEmbeddable>
+public class OrmEclipseLinkEmbeddable1_1UiProvider 
+	extends AbstractEmbeddableUiProvider<OrmEclipseLinkEmbeddable>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddable1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddable1_1UiProvider();
+	private static final OrmEclipseLinkEmbeddable1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddable1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmEmbeddable> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkEmbeddable> instance() {
 		return INSTANCE;
 	}
 	
@@ -40,7 +40,7 @@ public class EclipseLinkOrmEmbeddable1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddable1_1UiProvider() {
+	private OrmEclipseLinkEmbeddable1_1UiProvider() {
 		super();
 	}
 	
@@ -50,9 +50,9 @@ public class EclipseLinkOrmEmbeddable1_1UiProvider
 	
 	public JpaComposite buildPersistentTypeMappingComposite(
 			JpaUiFactory factory, 
-			PropertyValueModel<EclipseLinkOrmEmbeddable> subjectHolder, 
+			PropertyValueModel<OrmEclipseLinkEmbeddable> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmEmbeddableComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java
index caa2e24cda..620dc9deba 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmEmbeddedIdMappingComposite extends AbstractEmbeddedMappingComposite<EmbeddedIdMapping>
+public class OrmEclipseLinkEmbeddedIdMapping1_1Composite extends AbstractEmbeddedMappingComposite<EmbeddedIdMapping>
                                         implements JpaComposite
 {
 	/**
@@ -47,7 +47,7 @@ public class EclipseLink1_1OrmEmbeddedIdMappingComposite extends AbstractEmbedde
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmEmbeddedIdMappingComposite(PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
+	public OrmEclipseLinkEmbeddedIdMapping1_1Composite(PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder,
 	                                  Composite parent,
 	                                  WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddedIdMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedIdMapping1_1UiProvider.java
index 9e69f9dc35..9c0bfaf330 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddedIdMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedIdMapping1_1UiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddedIdMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddedIdMapping1_1UiProvider
+public class OrmEclipseLinkEmbeddedIdMapping1_1UiProvider
 	extends AbstractEmbeddedIdMappingUiProvider<OrmEmbeddedIdMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddedIdMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddedIdMapping1_1UiProvider();
+	private static final OrmEclipseLinkEmbeddedIdMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddedIdMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmEmbeddedIdMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddedIdMapping1_1UiProvider() {
+	private OrmEclipseLinkEmbeddedIdMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -52,6 +52,6 @@ public class EclipseLinkOrmEmbeddedIdMapping1_1UiProvider
 			PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmEmbeddedIdMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedMapping1_1Composite.java
index 41269bf728..b03b30495f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedMapping1_1Composite.java
@@ -37,7 +37,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmEmbeddedMappingComposite extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
+public class OrmEclipseLinkEmbeddedMapping1_1Composite extends AbstractEmbeddedMappingComposite<EmbeddedMapping>
                                       implements JpaComposite
 {
 	/**
@@ -47,7 +47,7 @@ public class EclipseLink1_1OrmEmbeddedMappingComposite extends AbstractEmbeddedM
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmEmbeddedMappingComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
+	public OrmEclipseLinkEmbeddedMapping1_1Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder,
 	                                Composite parent,
 	                                WidgetFactory widgetFactory) {
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddedMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedMapping1_1UiProvider.java
index 1c27b73237..c73a3881cc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEmbeddedMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEmbeddedMapping1_1UiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractEmbeddedMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEmbeddedMapping1_1UiProvider
+public class OrmEclipseLinkEmbeddedMapping1_1UiProvider
 	extends AbstractEmbeddedMappingUiProvider<OrmEmbeddedMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmEmbeddedMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmEmbeddedMapping1_1UiProvider();
+	private static final OrmEclipseLinkEmbeddedMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkEmbeddedMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmEmbeddedMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEmbeddedMapping1_1UiProvider() {
+	private OrmEclipseLinkEmbeddedMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -52,6 +52,6 @@ public class EclipseLinkOrmEmbeddedMapping1_1UiProvider
 			PropertyValueModel<OrmEmbeddedMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmEmbeddedMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEmbeddedMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEntity1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEntity1_1UiProvider.java
index 4b47ffa86e..5ed11d83b3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmEntity1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkEntity1_1UiProvider.java
@@ -11,9 +11,9 @@
 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.orm.OrmEclipseLinkEntity;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmEntity;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmEntityComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkEntityComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -22,17 +22,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractEntityUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmEntity1_1UiProvider 
-	extends AbstractEntityUiProvider<EclipseLinkOrmEntity>
+public class OrmEclipseLinkEntity1_1UiProvider 
+	extends AbstractEntityUiProvider<OrmEclipseLinkEntity>
 {
 	// singleton
-	private static final EclipseLinkOrmEntity1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmEntity1_1UiProvider();
+	private static final OrmEclipseLinkEntity1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkEntity1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmEntity> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkEntity> instance() {
 		return INSTANCE;
 	}
 	
@@ -43,16 +43,16 @@ public class EclipseLinkOrmEntity1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmEntity1_1UiProvider() {
+	private OrmEclipseLinkEntity1_1UiProvider() {
 		super();
 	}
 	
 	
 	public JpaComposite buildPersistentTypeMappingComposite(
 			JpaUiFactory factory, 
-			PropertyValueModel<EclipseLinkOrmEntity> subjectHolder, 
+			PropertyValueModel<OrmEclipseLinkEntity> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmEntityComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkIdMapping1_1Composite.java
index 0d864d8003..519537ac4f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkIdMapping1_1Composite.java
@@ -12,7 +12,7 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkIdMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.MutableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMutableComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.ColumnComposite;
@@ -20,7 +20,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLink1_1OrmIdMappingComposite extends EclipseLinkIdMappingComposite
+public class OrmEclipseLinkIdMapping1_1Composite extends EclipseLinkIdMappingComposite
 {
 	/**
 	 * Creates a new <code>
@@ -30,7 +30,7 @@ public</code>.
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmIdMappingComposite(PropertyValueModel<? extends IdMapping> subjectHolder,
+	public OrmEclipseLinkIdMapping1_1Composite(PropertyValueModel<? extends IdMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -48,7 +48,7 @@ public</code>.
 		container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
 
 		new AccessTypeComposite(this, buildAccessHolderHolder(), container);
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmIdMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkIdMapping1_1UiProvider.java
index 559abb1fd6..fb9fd07b2b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmIdMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkIdMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmIdMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkIdMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractIdMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmIdMapping1_1UiProvider
-	extends AbstractIdMappingUiProvider<EclipseLinkOrmIdMapping>
+public class OrmEclipseLinkIdMapping1_1UiProvider
+	extends AbstractIdMappingUiProvider<OrmEclipseLinkIdMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmIdMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmIdMapping1_1UiProvider();
+	private static final OrmEclipseLinkIdMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkIdMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmIdMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkIdMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmIdMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmIdMapping1_1UiProvider() {
+	private OrmEclipseLinkIdMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmIdMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmIdMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkIdMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmIdMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkIdMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToManyMapping1_1Composite.java
index 482d5491ac..b3a69b05d2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToManyMapping1_1Composite.java
@@ -12,7 +12,7 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToManyMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.JoinFetchComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkJoinFetchComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.CascadeComposite;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmManyToManyMappingComposite extends EclipseLinkManyToManyMappingComposite
+public class OrmEclipseLinkManyToManyMapping1_1Composite extends EclipseLinkManyToManyMappingComposite
 {
 	/**
 	 * Creates a new <code>ManyToManyMappingComposite</code>.
@@ -75,7 +75,7 @@ public class EclipseLink1_1OrmManyToManyMappingComposite extends EclipseLinkMany
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmManyToManyMappingComposite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
+	public OrmEclipseLinkManyToManyMapping1_1Composite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder,
 	                                  Composite parent,
 	                                  WidgetFactory widgetFactory) {
 
@@ -90,7 +90,7 @@ public class EclipseLink1_1OrmManyToManyMappingComposite extends EclipseLinkMany
 		new ManyToManyJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new AccessTypeComposite(this, buildAccessHolderHolder(), addPane(container, groupBoxMargin));
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 		new OrderingComposite(this, container);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmManyToManyMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToManyMapping1_1UiProvider.java
index f0c85656bd..0360c7de2c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmManyToManyMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToManyMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkManyToManyMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractManyToManyMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmManyToManyMapping1_1UiProvider
-	extends AbstractManyToManyMappingUiProvider<EclipseLinkOrmManyToManyMapping>
+public class OrmEclipseLinkManyToManyMapping1_1UiProvider
+	extends AbstractManyToManyMappingUiProvider<OrmEclipseLinkManyToManyMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmManyToManyMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmManyToManyMapping1_1UiProvider();
+	private static final OrmEclipseLinkManyToManyMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkManyToManyMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmManyToManyMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkManyToManyMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmManyToManyMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmManyToManyMapping1_1UiProvider() {
+	private OrmEclipseLinkManyToManyMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmManyToManyMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmManyToManyMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkManyToManyMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmManyToManyMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkManyToManyMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToOneMapping1_1Composite.java
index ce2cb68ccc..cda31b61c8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToOneMapping1_1Composite.java
@@ -12,7 +12,7 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkManyToOneMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.JoinFetchComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkJoinFetchComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.CascadeComposite;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmManyToOneMappingComposite extends EclipseLinkManyToOneMappingComposite
+public class OrmEclipseLinkManyToOneMapping1_1Composite extends EclipseLinkManyToOneMappingComposite
 {
 	/**
 	 * Creates a new <code>EclipseLink1_1ManyToOneMappingComposite</code>.
@@ -75,7 +75,7 @@ public class EclipseLink1_1OrmManyToOneMappingComposite extends EclipseLinkManyT
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
+	public OrmEclipseLinkManyToOneMapping1_1Composite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder,
 	                                 Composite parent,
 	                                 WidgetFactory widgetFactory) {
 
@@ -90,7 +90,7 @@ public class EclipseLink1_1OrmManyToOneMappingComposite extends EclipseLinkManyT
 		new ManyToOneJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new AccessTypeComposite(this, buildAccessHolderHolder(), addPane(container, groupBoxMargin));
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));		
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new OptionalComposite(this, addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmManyToOneMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToOneMapping1_1UiProvider.java
index 5bad9eb3fe..2a826094c0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmManyToOneMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkManyToOneMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmManyToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkManyToOneMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractManyToOneMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmManyToOneMapping1_1UiProvider
-	extends AbstractManyToOneMappingUiProvider<EclipseLinkOrmManyToOneMapping>
+public class OrmEclipseLinkManyToOneMapping1_1UiProvider
+	extends AbstractManyToOneMappingUiProvider<OrmEclipseLinkManyToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmManyToOneMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmManyToOneMapping1_1UiProvider();
+	private static final OrmEclipseLinkManyToOneMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkManyToOneMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmManyToOneMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkManyToOneMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmManyToOneMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmManyToOneMapping1_1UiProvider() {
+	private OrmEclipseLinkManyToOneMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmManyToOneMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmManyToOneMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkManyToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmManyToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkManyToOneMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmMappedSuperclass1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkMappedSuperclass1_1UiProvider.java
index 3a4c171cc7..61327b013d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmMappedSuperclass1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkMappedSuperclass1_1UiProvider.java
@@ -11,9 +11,9 @@
 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.orm.OrmEclipseLinkMappedSuperclass;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmMappedSuperclass;
-import org.eclipse.jpt.eclipselink.ui.internal.orm.details.EclipseLinkOrmMappedSuperclassComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.orm.details.OrmEclipseLinkMappedSuperclassComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.JpaComposite;
@@ -22,17 +22,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractMappedSuperclassUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmMappedSuperclass1_1UiProvider 
-	extends AbstractMappedSuperclassUiProvider<EclipseLinkOrmMappedSuperclass>
+public class OrmEclipseLinkMappedSuperclass1_1UiProvider 
+	extends AbstractMappedSuperclassUiProvider<OrmEclipseLinkMappedSuperclass>
 {
 	// singleton
-	private static final EclipseLinkOrmMappedSuperclass1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmMappedSuperclass1_1UiProvider();
+	private static final OrmEclipseLinkMappedSuperclass1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkMappedSuperclass1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static TypeMappingUiProvider<EclipseLinkOrmMappedSuperclass> instance() {
+	public static TypeMappingUiProvider<OrmEclipseLinkMappedSuperclass> instance() {
 		return INSTANCE;
 	}
 	
@@ -40,7 +40,7 @@ public class EclipseLinkOrmMappedSuperclass1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmMappedSuperclass1_1UiProvider() {
+	private OrmEclipseLinkMappedSuperclass1_1UiProvider() {
 		super();
 	}
 	
@@ -48,7 +48,7 @@ public class EclipseLinkOrmMappedSuperclass1_1UiProvider
 		return JptEclipseLinkCorePlugin.ECLIPSELINK1_1_ORM_XML_CONTENT_TYPE;
 	}
 
-	public JpaComposite buildPersistentTypeMappingComposite(JpaUiFactory factory, PropertyValueModel<EclipseLinkOrmMappedSuperclass> subjectHolder, Composite parent, WidgetFactory widgetFactory) {
-		return new EclipseLinkOrmMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
+	public JpaComposite buildPersistentTypeMappingComposite(JpaUiFactory factory, PropertyValueModel<OrmEclipseLinkMappedSuperclass> subjectHolder, Composite parent, WidgetFactory widgetFactory) {
+		return new OrmEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToManyMapping1_1Composite.java
index e089e1ff19..689ba6bfbd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToManyMapping1_1Composite.java
@@ -14,8 +14,8 @@ import org.eclipse.jpt.core.context.OneToManyMapping;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyMapping;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkOneToManyJoiningStrategyPane;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkOneToManyMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.JoinFetchComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.PrivateOwnedComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkJoinFetchComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkPrivateOwnedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.CascadeComposite;
@@ -27,9 +27,9 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
 
-public class EclipseLink1_1OrmOneToManyMappingComposite extends EclipseLinkOneToManyMappingComposite
+public class OrmEclipseLinkOneToManyMapping1_1Composite extends EclipseLinkOneToManyMappingComposite
 {
-	public EclipseLink1_1OrmOneToManyMappingComposite(
+	public OrmEclipseLinkOneToManyMapping1_1Composite(
 			PropertyValueModel<? extends EclipseLinkOneToManyMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
@@ -44,8 +44,8 @@ public class EclipseLink1_1OrmOneToManyMappingComposite extends EclipseLinkOneTo
 		new EclipseLinkOneToManyJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new AccessTypeComposite(this, buildAccessHolderHolder(), addPane(container, groupBoxMargin));
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
-		new PrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 		new OrderingComposite(this, container);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmOneToManyMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToManyMapping1_1UiProvider.java
index eaf34069ed..2115c03efd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmOneToManyMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToManyMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToManyMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkOneToManyMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractOneToManyMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmOneToManyMapping1_1UiProvider
-	extends AbstractOneToManyMappingUiProvider<EclipseLinkOrmOneToManyMapping>
+public class OrmEclipseLinkOneToManyMapping1_1UiProvider
+	extends AbstractOneToManyMappingUiProvider<OrmEclipseLinkOneToManyMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmOneToManyMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmOneToManyMapping1_1UiProvider();
+	private static final OrmEclipseLinkOneToManyMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkOneToManyMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmOneToManyMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkOneToManyMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmOneToManyMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmOneToManyMapping1_1UiProvider() {
+	private OrmEclipseLinkOneToManyMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmOneToManyMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmOneToManyMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkOneToManyMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmOneToManyMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkOneToManyMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToOneMapping1_1Composite.java
index e853c86c4c..3e5896008a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToOneMapping1_1Composite.java
@@ -12,8 +12,8 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkOneToOneMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.JoinFetchComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.PrivateOwnedComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkJoinFetchComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkPrivateOwnedComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.CascadeComposite;
@@ -73,7 +73,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.2
  * @since 2.2
  */
-public class EclipseLink1_1OrmOneToOneMappingComposite extends EclipseLinkOneToOneMappingComposite
+public class OrmEclipseLinkOneToOneMapping1_1Composite extends EclipseLinkOneToOneMappingComposite
 {
 	/**
 	 * Creates a new <code>Eclipselink1_1OneToOneMappingComposite</code>.
@@ -82,7 +82,7 @@ public class EclipseLink1_1OrmOneToOneMappingComposite extends EclipseLinkOneToO
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmOneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
+	public OrmEclipseLinkOneToOneMapping1_1Composite(PropertyValueModel<? extends OneToOneMapping> subjectHolder,
 	                                Composite parent,
 	                                WidgetFactory widgetFactory) {
 
@@ -97,9 +97,9 @@ public class EclipseLink1_1OrmOneToOneMappingComposite extends EclipseLinkOneToO
 		new AccessTypeComposite(this, buildAccessHolderHolder(), addPane(container, groupBoxMargin));
 		new OneToOneJoiningStrategyPane(this, buildJoiningHolder(), container);
 		new FetchTypeComposite(this, addPane(container, groupBoxMargin));
-		new JoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin));
 		new OptionalComposite(this, addPane(container, groupBoxMargin));
-		new PrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
+		new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin));
 		new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
 	}
 		
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmOneToOneMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToOneMapping1_1UiProvider.java
index a37ee348b5..05ea09e758 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmOneToOneMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkOneToOneMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmOneToOneMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkOneToOneMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractOneToOneMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmOneToOneMapping1_1UiProvider
-	extends AbstractOneToOneMappingUiProvider<EclipseLinkOrmOneToOneMapping>
+public class OrmEclipseLinkOneToOneMapping1_1UiProvider
+	extends AbstractOneToOneMappingUiProvider<OrmEclipseLinkOneToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmOneToOneMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmOneToOneMapping1_1UiProvider();
+	private static final OrmEclipseLinkOneToOneMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkOneToOneMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmOneToOneMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkOneToOneMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmOneToOneMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmOneToOneMapping1_1UiProvider() {
+	private OrmEclipseLinkOneToOneMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmOneToOneMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmOneToOneMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkOneToOneMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmTransformationMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkTransformationMapping1_1UiProvider.java
index 63d0bc87a2..24397a7bdd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmTransformationMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkTransformationMapping1_1UiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTransformationMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.TransformationMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkTransformationMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmTransformationMapping1_1UiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
+public class OrmEclipseLinkTransformationMapping1_1UiProvider extends EclipseLinkTransformationMappingUiProvider<EclipseLinkTransformationMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmTransformationMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmTransformationMapping1_1UiProvider();
+	private static final OrmEclipseLinkTransformationMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkTransformationMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmTransformationMapping1_1UiProvider extends EclipseLin
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmTransformationMapping1_1UiProvider() {
+	private OrmEclipseLinkTransformationMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -52,6 +52,6 @@ public class EclipseLinkOrmTransformationMapping1_1UiProvider extends EclipseLin
 		Composite parent,
 		WidgetFactory widgetFactory) {
 		
-		return new TransformationMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkTransformationMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmTransientMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkTransientMapping1_1UiProvider.java
index ef37058208..1863de1860 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmTransientMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkTransientMapping1_1UiProvider.java
@@ -21,12 +21,12 @@ import org.eclipse.jpt.ui.internal.details.AbstractTransientMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmTransientMapping1_1UiProvider
+public class OrmEclipseLinkTransientMapping1_1UiProvider
 	extends AbstractTransientMappingUiProvider<OrmTransientMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmTransientMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmTransientMapping1_1UiProvider();
+	private static final OrmEclipseLinkTransientMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkTransientMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -39,7 +39,7 @@ public class EclipseLinkOrmTransientMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmTransientMapping1_1UiProvider() {
+	private OrmEclipseLinkTransientMapping1_1UiProvider() {
 		super();
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmVariableOneToOneMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVariableOneToOneMapping1_1UiProvider.java
index 42c49c6f6e..d459c3200e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmVariableOneToOneMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVariableOneToOneMapping1_1UiProvider.java
@@ -13,7 +13,7 @@ import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVariableOneToOneMapping;
 import org.eclipse.jpt.eclipselink.core.internal.JptEclipseLinkCorePlugin;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingUiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.VariableOneToOneMappingComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVariableOneToOneMappingComposite;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -21,11 +21,11 @@ import org.eclipse.jpt.ui.details.JpaComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmVariableOneToOneMapping1_1UiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
+public class OrmEclipseLinkVariableOneToOneMapping1_1UiProvider extends EclipseLinkVariableOneToOneMappingUiProvider<EclipseLinkVariableOneToOneMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmVariableOneToOneMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmVariableOneToOneMapping1_1UiProvider();
+	private static final OrmEclipseLinkVariableOneToOneMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkVariableOneToOneMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
@@ -38,7 +38,7 @@ public class EclipseLinkOrmVariableOneToOneMapping1_1UiProvider extends EclipseL
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmVariableOneToOneMapping1_1UiProvider() {
+	private OrmEclipseLinkVariableOneToOneMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -51,6 +51,6 @@ public class EclipseLinkOrmVariableOneToOneMapping1_1UiProvider extends EclipseL
 			PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new VariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
+		return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVersionMapping1_1Composite.java
index d74637ee33..6e7c7b8323 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLink1_1OrmVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVersionMapping1_1Composite.java
@@ -12,7 +12,7 @@ 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;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkVersionMappingComposite;
-import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.MutableComposite;
+import org.eclipse.jpt.eclipselink.ui.internal.mappings.details.EclipseLinkMutableComposite;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.internal.details.AccessTypeComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.ColumnComposite;
@@ -20,7 +20,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLink1_1OrmVersionMappingComposite extends EclipseLinkVersionMappingComposite
+public class OrmEclipseLinkVersionMapping1_1Composite extends EclipseLinkVersionMappingComposite
 {
 	/**
 	 * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>.
@@ -29,7 +29,7 @@ public class EclipseLink1_1OrmVersionMappingComposite extends EclipseLinkVersion
 	 * @param parent The parent container
 	 * @param widgetFactory The factory used to create various common widgets
 	 */
-	public EclipseLink1_1OrmVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder,
+	public OrmEclipseLinkVersionMapping1_1Composite(PropertyValueModel<? extends VersionMapping> subjectHolder,
 	                               Composite parent,
 	                               WidgetFactory widgetFactory) {
 
@@ -47,7 +47,7 @@ public class EclipseLink1_1OrmVersionMappingComposite extends EclipseLinkVersion
 		container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
 
 		new AccessTypeComposite(this, buildAccessHolderHolder(), container);
-		new MutableComposite(this, buildMutableHolder(), container);
+		new EclipseLinkMutableComposite(this, buildMutableHolder(), container);
 	}
 	
 	protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmVersionMapping1_1UiProvider.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVersionMapping1_1UiProvider.java
index 14adf0f849..0ccd425138 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/EclipseLinkOrmVersionMapping1_1UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/orm/details/OrmEclipseLinkVersionMapping1_1UiProvider.java
@@ -11,7 +11,7 @@ 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;
-import org.eclipse.jpt.eclipselink.core.internal.context.orm.EclipseLinkOrmVersionMapping;
+import org.eclipse.jpt.eclipselink.core.internal.context.orm.OrmEclipseLinkVersionMapping;
 import org.eclipse.jpt.ui.JpaUiFactory;
 import org.eclipse.jpt.ui.WidgetFactory;
 import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
@@ -20,17 +20,17 @@ import org.eclipse.jpt.ui.internal.details.AbstractVersionMappingUiProvider;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
 
-public class EclipseLinkOrmVersionMapping1_1UiProvider
-	extends AbstractVersionMappingUiProvider<EclipseLinkOrmVersionMapping>
+public class OrmEclipseLinkVersionMapping1_1UiProvider
+	extends AbstractVersionMappingUiProvider<OrmEclipseLinkVersionMapping>
 {
 	// singleton
-	private static final EclipseLinkOrmVersionMapping1_1UiProvider INSTANCE = 
-		new EclipseLinkOrmVersionMapping1_1UiProvider();
+	private static final OrmEclipseLinkVersionMapping1_1UiProvider INSTANCE = 
+		new OrmEclipseLinkVersionMapping1_1UiProvider();
 	
 	/**
 	 * Return the singleton.
 	 */
-	public static AttributeMappingUiProvider<EclipseLinkOrmVersionMapping> instance() {
+	public static AttributeMappingUiProvider<OrmEclipseLinkVersionMapping> instance() {
 		return INSTANCE;
 	}
 	
@@ -38,7 +38,7 @@ public class EclipseLinkOrmVersionMapping1_1UiProvider
 	/**
 	 * Ensure single instance.
 	 */
-	private EclipseLinkOrmVersionMapping1_1UiProvider() {
+	private OrmEclipseLinkVersionMapping1_1UiProvider() {
 		super();
 	}
 	
@@ -48,9 +48,9 @@ public class EclipseLinkOrmVersionMapping1_1UiProvider
 	
 	public JpaComposite buildAttributeMappingComposite(
 			JpaUiFactory factory,
-			PropertyValueModel<EclipseLinkOrmVersionMapping> subjectHolder,
+			PropertyValueModel<OrmEclipseLinkVersionMapping> subjectHolder,
 			Composite parent,
 			WidgetFactory widgetFactory) {
-		return new EclipseLink1_1OrmVersionMappingComposite(subjectHolder, parent, widgetFactory);
+		return new OrmEclipseLinkVersionMapping1_1Composite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/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 e4988dcc07..19f1125c70 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/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
@@ -11,23 +11,23 @@ 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.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmBasicCollectionMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmBasicMapMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmBasicMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmEmbeddable1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmEmbeddedIdMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmEmbeddedMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmEntity1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmIdMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmManyToManyMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmManyToOneMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmMappedSuperclass1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmOneToManyMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmOneToOneMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmTransformationMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmTransientMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmVariableOneToOneMapping1_1UiProvider;
-import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.EclipseLinkOrmVersionMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkBasicCollectionMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkBasicMapMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkBasicMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkEmbeddable1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkEmbeddedIdMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkEmbeddedMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkEntity1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkIdMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkManyToManyMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkManyToOneMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkMappedSuperclass1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkOneToManyMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkOneToOneMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkTransformationMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkTransientMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkVariableOneToOneMapping1_1UiProvider;
+import org.eclipse.jpt.eclipselink.ui.internal.v1_1.orm.details.OrmEclipseLinkVersionMapping1_1UiProvider;
 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;
@@ -78,9 +78,9 @@ public class EclipseLink1_1JpaPlatformUiProvider extends AbstractJpaPlatformUiPr
 
 	@Override
 	protected void addTypeMappingUiProvidersTo(List<TypeMappingUiProvider<?>> providers) {
-		providers.add(EclipseLinkOrmEntity1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmMappedSuperclass1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddable1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkEntity1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkMappedSuperclass1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddable1_1UiProvider.instance());
 	}
 	
 	@Override
@@ -93,20 +93,20 @@ public class EclipseLink1_1JpaPlatformUiProvider extends AbstractJpaPlatformUiPr
 	
 	@Override
 	protected void addAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) {
-		providers.add(EclipseLinkOrmIdMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedIdMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmBasicMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmBasicCollectionMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmBasicMapMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmVersionMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmManyToOneMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmOneToManyMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmEmbeddedMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmOneToOneMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmVariableOneToOneMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmManyToManyMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmTransformationMapping1_1UiProvider.instance());
-		providers.add(EclipseLinkOrmTransientMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkIdMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddedIdMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkBasicMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkBasicCollectionMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkBasicMapMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkVersionMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkManyToOneMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkOneToManyMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkEmbeddedMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkOneToOneMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkVariableOneToOneMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkManyToManyMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkTransformationMapping1_1UiProvider.instance());
+		providers.add(OrmEclipseLinkTransientMapping1_1UiProvider.instance());
 	}
 	
 	@Override