renaming some eclipseLink classes, trying to be more consistent

13 files changed, 107 insertions, 107 deletions

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/EclipseLinkJavaEntityComposite.java
index aca319354b..c87f527bc8 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/EclipseLinkJavaEntityComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.java.details;
 import org.eclipse.jpt.core.context.Entity;
 import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.eclipselink.core.context.Customizer;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkEntity;
 import org.eclipse.jpt.eclipselink.core.context.ReadOnly;
 import org.eclipse.jpt.eclipselink.core.context.java.EclipseLinkJavaEntity;
@@ -78,12 +78,12 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
 		new CachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<JavaEntity, EclipseLinkCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<JavaEntity, EclipseLinkCaching>(
+	private PropertyAspectAdapter<JavaEntity, Caching> buildCachingHolder() {
+		return new PropertyAspectAdapter<JavaEntity, Caching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkCaching buildValue_() {
+			protected Caching buildValue_() {
 				return ((EclipseLinkJavaEntity) this.subject).getCaching();
 			}
 		};
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/AlwaysRefreshComposite.java
index 0dc9fbdf13..3f12c132f6 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/AlwaysRefreshComposite.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
+public class AlwaysRefreshComposite extends FormPane<Caching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -39,14 +39,14 @@ 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 AlwaysRefreshComposite(FormPane<? extends Caching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
 	}
 
 	private WritablePropertyValueModel<Boolean> buildAlwaysRefreshHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.SPECIFIED_ALWAYS_REFRESH_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.getSpecifiedAlwaysRefresh();
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/CacheCoordinationTypeComposite.java
index b5aa37efcb..b5217f9829 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/CacheCoordinationTypeComposite.java
@@ -10,7 +10,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import java.util.Collection;
 import org.eclipse.jpt.eclipselink.core.context.CacheCoordinationType;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching> {
+public class CacheCoordinationTypeComposite extends FormPane<Caching> {
 
 	/**
 	 * Creates a new <code>CacheTypeComposite</code>.
@@ -40,21 +40,21 @@ 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 CacheCoordinationTypeComposite(FormPane<? extends Caching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
 	}
 
-	private EnumFormComboViewer<EclipseLinkCaching, CacheCoordinationType> addCacheCoordinationTypeCombo(Composite container) {
+	private EnumFormComboViewer<Caching, CacheCoordinationType> addCacheCoordinationTypeCombo(Composite container) {
 
-		return new EnumFormComboViewer<EclipseLinkCaching, CacheCoordinationType>(this, container) {
+		return new EnumFormComboViewer<Caching, CacheCoordinationType>(this, container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(EclipseLinkCaching.DEFAULT_COORDINATION_TYPE_PROPERTY);
-				propertyNames.add(EclipseLinkCaching.SPECIFIED_COORDINATION_TYPE_PROPERTY);
+				propertyNames.add(Caching.DEFAULT_COORDINATION_TYPE_PROPERTY);
+				propertyNames.add(Caching.SPECIFIED_COORDINATION_TYPE_PROPERTY);
 			}
 
 			@Override
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/CacheSizeComposite.java
index 15b60889e8..516205941a 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/CacheSizeComposite.java
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Spinner;
  * @version 2.1
  * @since 2.1
  */
-public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
+public class CacheSizeComposite extends FormPane<Caching> {
 
 	/**
 	 * Creates a new <code>CacheSizeComposite</code>.
@@ -48,7 +48,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 CacheSizeComposite(FormPane<? extends Caching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -73,7 +73,7 @@ public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private WritablePropertyValueModel<Integer> buildSizeHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SIZE_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Integer>(getSubjectHolder(), Caching.SPECIFIED_SIZE_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return subject.getSpecifiedSize();
@@ -90,7 +90,7 @@ public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
 	}
 
 	private WritablePropertyValueModel<Integer> buildDefaultSizeHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.DEFAULT_SIZE_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Integer>(getSubjectHolder(), Caching.DEFAULT_SIZE_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return subject.getDefaultSize();
@@ -133,7 +133,7 @@ public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
 			protected String transform(Integer value) {
 
 				Integer defaultValue = (getSubject() != null) ? getSubject().getDefaultSize() :
-								EclipseLinkCaching.DEFAULT_SIZE;
+								Caching.DEFAULT_SIZE;
 
 				return NLS.bind(
 					JptUiMappingsMessages.DefaultWithValue,
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/CacheTypeComposite.java
index 22ee2c7ab0..d6981e0cfe 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/CacheTypeComposite.java
@@ -10,7 +10,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import java.util.Collection;
 import org.eclipse.jpt.eclipselink.core.context.CacheType;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
+public class CacheTypeComposite extends FormPane<Caching> {
 
 	/**
 	 * Creates a new <code>CacheTypeComposite</code>.
@@ -40,21 +40,21 @@ 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 CacheTypeComposite(FormPane<? extends Caching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
 	}
 
-	private EnumFormComboViewer<EclipseLinkCaching, CacheType> addCacheTypeCombo(Composite container) {
+	private EnumFormComboViewer<Caching, CacheType> addCacheTypeCombo(Composite container) {
 
-		return new EnumFormComboViewer<EclipseLinkCaching, CacheType>(this, container) {
+		return new EnumFormComboViewer<Caching, CacheType>(this, container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(EclipseLinkCaching.DEFAULT_TYPE_PROPERTY);
-				propertyNames.add(EclipseLinkCaching.SPECIFIED_TYPE_PROPERTY);
+				propertyNames.add(Caching.DEFAULT_TYPE_PROPERTY);
+				propertyNames.add(Caching.SPECIFIED_TYPE_PROPERTY);
 			}
 
 			@Override
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/CachingComposite.java
index e9624bd54f..d3aaac7fe2 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/CachingComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
@@ -56,11 +56,11 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class CachingComposite extends FormPane<EclipseLinkCaching>
+public class CachingComposite extends FormPane<Caching>
 {
 
 	public CachingComposite(FormPane<?> parentPane,
-        PropertyValueModel<EclipseLinkCaching> subjectHolder,
+        PropertyValueModel<Caching> subjectHolder,
         Composite parent) {
 
 		super(parentPane, subjectHolder, parent);
@@ -108,7 +108,7 @@ public class CachingComposite extends FormPane<EclipseLinkCaching>
 	}
 	
 	private PropertyValueModel<Boolean> buildSharedCacheEnabler() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.SPECIFIED_SHARED_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.getShared();
@@ -117,7 +117,7 @@ public class CachingComposite extends FormPane<EclipseLinkCaching>
 	}	
 	
 	private WritablePropertyValueModel<Boolean> buildSharedHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.SPECIFIED_SHARED_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.getSpecifiedShared();
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/ConversionValueDialog.java
index cff145d627..4fec7be833 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/ConversionValueDialog.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import java.util.Set;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConversionValue;
+import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.DialogPane;
@@ -36,7 +36,7 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 	/**
 	 * when creating a new EclipseLinkConversionValue, 'conversionValue' will be null
 	 */
-	private final EclipseLinkConversionValue conversionValue;
+	private final ConversionValue conversionValue;
 
 	private EclipseLinkObjectTypeConverter objectTypeConverter;
 	
@@ -52,7 +52,7 @@ public class ConversionValueDialog extends ValidatingDialog<ConversionValueState
 	/**
 	 * Use this constructor to edit an existing conversion value
 	 */
-	public ConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, EclipseLinkConversionValue conversionValue) {
+	public ConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, ConversionValue conversionValue) {
 		super(parent);
 		this.objectTypeConverter = objectTypeConverter;
 		this.conversionValue = conversionValue;
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/DisableHitsComposite.java
index db24068788..a5c379628b 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/DisableHitsComposite.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
+public class DisableHitsComposite extends FormPane<Caching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -38,14 +38,14 @@ 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 DisableHitsComposite(FormPane<? extends Caching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
 	}
 
 	private WritablePropertyValueModel<Boolean> buildDisableHitsHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.SPECIFIED_DISABLE_HITS_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.getSpecifiedDisableHits();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassComposite.java
index 1498f46a1e..efb757a775 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/EclipseLinkMappedSuperclassComposite.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import org.eclipse.jpt.core.context.MappedSuperclass;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMappedSuperclass;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.WidgetFactory;
@@ -56,12 +56,12 @@ public abstract class EclipseLinkMappedSuperclassComposite<T extends MappedSuper
 		new CachingComposite(this, buildCachingHolder(), container);
 	}
 
-	private PropertyAspectAdapter<T, EclipseLinkCaching> buildCachingHolder() {
-		return new PropertyAspectAdapter<T, EclipseLinkCaching>(
+	private PropertyAspectAdapter<T, Caching> buildCachingHolder() {
+		return new PropertyAspectAdapter<T, Caching>(
 			getSubjectHolder())
 		{
 			@Override
-			protected EclipseLinkCaching buildValue_() {
+			protected Caching buildValue_() {
 				return ((EclipseLinkMappedSuperclass) this.subject).getCaching();
 			}
 		};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
index 6c4a1db063..bfd6985b9e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
@@ -9,7 +9,7 @@
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
 import java.util.Collection;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.core.context.ExistenceType;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class ExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
+public class ExistenceCheckingComposite extends FormPane<Caching> {
 
 	/**
 	 * Creates a new <code>ExistenceCheckingComposite</code>.
@@ -41,7 +41,7 @@ public class ExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
 	 * @param parentPane The parent container of this one
 	 * @param parent The parent container
 	 */
-	public ExistenceCheckingComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public ExistenceCheckingComposite(FormPane<? extends Caching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -63,15 +63,15 @@ public class ExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
        );
 	}
 
-	private EnumFormComboViewer<EclipseLinkCaching, ExistenceType> addExistenceCheckingTypeCombo(Composite container) {
+	private EnumFormComboViewer<Caching, ExistenceType> addExistenceCheckingTypeCombo(Composite container) {
 
-		return new EnumFormComboViewer<EclipseLinkCaching, ExistenceType>(this, container) {
+		return new EnumFormComboViewer<Caching, ExistenceType>(this, container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(EclipseLinkCaching.DEFAULT_EXISTENCE_TYPE_PROPERTY);
-				propertyNames.add(EclipseLinkCaching.SPECIFIED_EXISTENCE_TYPE_PROPERTY);
+				propertyNames.add(Caching.DEFAULT_EXISTENCE_TYPE_PROPERTY);
+				propertyNames.add(Caching.SPECIFIED_EXISTENCE_TYPE_PROPERTY);
 			}
 
 			@Override
@@ -111,7 +111,7 @@ public class ExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildExistenceCheckingHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXISTENCE_CHECKING_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.EXISTENCE_CHECKING_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.hasExistenceChecking();
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/ExpiryComposite.java
index bbafb139d5..c8fc752f99 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/ExpiryComposite.java
@@ -8,8 +8,8 @@
  *******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkExpiryTimeOfDay;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
+import org.eclipse.jpt.eclipselink.core.context.ExpiryTimeOfDay;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.util.ControlEnabler;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
@@ -47,9 +47,9 @@ import org.eclipse.swt.widgets.Spinner;
  * @version 2.1
  * @since 2.1
  */
-public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
+public class ExpiryComposite extends FormPane<Caching> {
 
-	public ExpiryComposite(FormPane<? extends EclipseLinkCaching> parentPane,
+	public ExpiryComposite(FormPane<? extends Caching> parentPane,
 	                          Composite parent) {
 
 		super(parentPane, parent);
@@ -140,7 +140,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 			EclipseLinkUiMappingsMessages.ExpiryComposite_timeOfDayExpiryExpireAt
 		);
 		
-		PropertyValueModel<EclipseLinkExpiryTimeOfDay> timeOfDayExpiryHolder = buildTimeOfDayExpiryHolder();
+		PropertyValueModel<ExpiryTimeOfDay> timeOfDayExpiryHolder = buildTimeOfDayExpiryHolder();
 		DateTime dateTime = addUnmanagedDateTime(
 			container, 
 			buildTimeOfDayExpiryHourHolder(timeOfDayExpiryHolder), 
@@ -152,10 +152,10 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildNoExpiryHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(
+		return new PropertyAspectAdapter<Caching, Boolean>(
 					getSubjectHolder(), 
-					EclipseLinkCaching.EXPIRY_PROPERTY, 
-					EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) {
+					Caching.EXPIRY_PROPERTY, 
+					Caching.EXPIRY_TIME_OF_DAY_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getExpiry() == null && this.subject.getExpiryTimeOfDay() == null);
@@ -172,9 +172,9 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 
 	private WritablePropertyValueModel<Boolean> buildExpiryHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(
+		return new PropertyAspectAdapter<Caching, Boolean>(
 					getSubjectHolder(), 
-					EclipseLinkCaching.EXPIRY_PROPERTY) {
+					Caching.EXPIRY_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getExpiry() != null);
@@ -190,9 +190,9 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private WritablePropertyValueModel<Boolean> buildTimeOfDayExpiryBooleanHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(
+		return new PropertyAspectAdapter<Caching, Boolean>(
 					getSubjectHolder(), 
-					EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) {
+					Caching.EXPIRY_TIME_OF_DAY_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getExpiryTimeOfDay() != null);
@@ -208,7 +208,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 
 	private WritablePropertyValueModel<Integer> buildTimeToLiveExpiryHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Integer>(getSubjectHolder(), Caching.EXPIRY_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return this.subject.getExpiry();
@@ -225,7 +225,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private PropertyValueModel<Boolean> buildTimeToLiveExpiryEnabler() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.EXPIRY_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getExpiry() != null);
@@ -234,7 +234,7 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 	}
 	
 	private PropertyValueModel<Boolean> buildTimeOfDayExpiryEnabler() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.EXPIRY_TIME_OF_DAY_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.getExpiryTimeOfDay() != null);
@@ -242,19 +242,19 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		};
 	}
 	
-	private PropertyValueModel<EclipseLinkExpiryTimeOfDay> buildTimeOfDayExpiryHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkExpiryTimeOfDay>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) {
+	private PropertyValueModel<ExpiryTimeOfDay> buildTimeOfDayExpiryHolder() {
+		return new PropertyAspectAdapter<Caching, ExpiryTimeOfDay>(getSubjectHolder(), Caching.EXPIRY_TIME_OF_DAY_PROPERTY) {
 			@Override
-			protected EclipseLinkExpiryTimeOfDay buildValue_() {
+			protected ExpiryTimeOfDay buildValue_() {
 				return this.subject.getExpiryTimeOfDay();
 			}
 		};
 	}
 
-	private WritablePropertyValueModel<Integer> buildTimeOfDayExpiryHourHolder(PropertyValueModel<EclipseLinkExpiryTimeOfDay> timeOfDayExpiryHolder) {
-		return new PropertyAspectAdapter<EclipseLinkExpiryTimeOfDay, Integer>(
+	private WritablePropertyValueModel<Integer> buildTimeOfDayExpiryHourHolder(PropertyValueModel<ExpiryTimeOfDay> timeOfDayExpiryHolder) {
+		return new PropertyAspectAdapter<ExpiryTimeOfDay, Integer>(
 					timeOfDayExpiryHolder, 
-					EclipseLinkExpiryTimeOfDay.HOUR_PROPERTY) {
+					ExpiryTimeOfDay.HOUR_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return this.subject.getHour();
@@ -267,10 +267,10 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		};
 	}
 
-	private WritablePropertyValueModel<Integer> buildTimeOfDayExpiryMinuteHolder(PropertyValueModel<EclipseLinkExpiryTimeOfDay> timeOfDayExpiryHolder) {
-		return new PropertyAspectAdapter<EclipseLinkExpiryTimeOfDay, Integer>(
+	private WritablePropertyValueModel<Integer> buildTimeOfDayExpiryMinuteHolder(PropertyValueModel<ExpiryTimeOfDay> timeOfDayExpiryHolder) {
+		return new PropertyAspectAdapter<ExpiryTimeOfDay, Integer>(
 					timeOfDayExpiryHolder, 
-					EclipseLinkExpiryTimeOfDay.MINUTE_PROPERTY) {
+					ExpiryTimeOfDay.MINUTE_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return this.subject.getMinute();
@@ -283,10 +283,10 @@ public class ExpiryComposite extends FormPane<EclipseLinkCaching> {
 		};
 	}
 
-	private WritablePropertyValueModel<Integer> buildTimeOfDayExpirySecondHolder(PropertyValueModel<EclipseLinkExpiryTimeOfDay> timeOfDayExpiryHolder) {
-		return new PropertyAspectAdapter<EclipseLinkExpiryTimeOfDay, Integer>(
+	private WritablePropertyValueModel<Integer> buildTimeOfDayExpirySecondHolder(PropertyValueModel<ExpiryTimeOfDay> timeOfDayExpiryHolder) {
+		return new PropertyAspectAdapter<ExpiryTimeOfDay, Integer>(
 					timeOfDayExpiryHolder, 
-					EclipseLinkExpiryTimeOfDay.SECOND_PROPERTY) {
+					ExpiryTimeOfDay.SECOND_PROPERTY) {
 			@Override
 			protected Integer buildValue_() {
 				return this.subject.getSecond();
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/ObjectTypeConverterComposite.java
index eeabdc9f9d..8eebffd079 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/ObjectTypeConverterComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkConversionValue;
+import org.eclipse.jpt.eclipselink.core.context.ConversionValue;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkNamedConverter;
 import org.eclipse.jpt.eclipselink.core.context.EclipseLinkObjectTypeConverter;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
@@ -219,7 +219,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		
 		int groupBoxMargin = getGroupBoxMargin();
 
-		WritablePropertyValueModel<EclipseLinkConversionValue> conversionValueHolder =
+		WritablePropertyValueModel<ConversionValue> conversionValueHolder =
 			buildConversionValueHolder();
 		// Conversion Values add/remove list pane
 		new AddRemoveTablePane<EclipseLinkObjectTypeConverter>(
@@ -232,15 +232,15 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 			null//TODO need a help context id for this
 		) {
 			@Override
-			protected ColumnAdapter<EclipseLinkConversionValue> buildColumnAdapter() {
+			protected ColumnAdapter<ConversionValue> buildColumnAdapter() {
 				return new ConversionValueColumnAdapter();
 			}
 		};
 
 	}
 
-	protected WritablePropertyValueModel<EclipseLinkConversionValue> buildConversionValueHolder() {
-		return new SimplePropertyValueModel<EclipseLinkConversionValue>();
+	protected WritablePropertyValueModel<ConversionValue> buildConversionValueHolder() {
+		return new SimplePropertyValueModel<ConversionValue>();
 	}
 
 	protected AddRemoveListPane.Adapter buildConversionValuesAdapter() {
@@ -263,7 +263,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 
 			@Override
 			public void optionOnSelection(ObjectListSelectionModel listSelectionModel) {
-				EclipseLinkConversionValue conversionValue = (EclipseLinkConversionValue) listSelectionModel.selectedValue();
+				ConversionValue conversionValue = (ConversionValue) listSelectionModel.selectedValue();
 				ConversionValueDialog dialog = new ConversionValueDialog(getControl().getShell(), getSubject(), conversionValue);
 				editConversionValueFromDialog(dialog, conversionValue);
 			}
@@ -289,14 +289,14 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 			return;
 		}
 
-		EclipseLinkConversionValue conversionValue = this.getSubject().addConversionValue();
+		ConversionValue conversionValue = this.getSubject().addConversionValue();
 		conversionValue.setDataValue(dialog.getDataValue());
 		conversionValue.setObjectValue(dialog.getObjectValue());
 
 		listSelectionModel.setSelectedValue(conversionValue);
 	}
 
-	protected void editConversionValueFromDialog(ConversionValueDialog dialog, EclipseLinkConversionValue conversionValue) {
+	protected void editConversionValueFromDialog(ConversionValueDialog dialog, ConversionValue conversionValue) {
 		if (dialog.open() != Window.OK) {
 			return;
 		}
@@ -305,16 +305,16 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		conversionValue.setObjectValue(dialog.getObjectValue());
 	}
 	
-	private ListValueModel<EclipseLinkConversionValue> buildConversionValuesListModel() {
-		return new ItemPropertyListValueModelAdapter<EclipseLinkConversionValue>(buildConversionValuesListHolder(), 
-			EclipseLinkConversionValue.DATA_VALUE_PROPERTY,
-			EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY);
+	private ListValueModel<ConversionValue> buildConversionValuesListModel() {
+		return new ItemPropertyListValueModelAdapter<ConversionValue>(buildConversionValuesListHolder(), 
+			ConversionValue.DATA_VALUE_PROPERTY,
+			ConversionValue.OBJECT_VALUE_PROPERTY);
 	}	
 
-	private ListValueModel<EclipseLinkConversionValue> buildConversionValuesListHolder() {
-		return new ListAspectAdapter<EclipseLinkObjectTypeConverter, EclipseLinkConversionValue>(getSubjectHolder(), EclipseLinkObjectTypeConverter.CONVERSION_VALUES_LIST) {
+	private ListValueModel<ConversionValue> buildConversionValuesListHolder() {
+		return new ListAspectAdapter<EclipseLinkObjectTypeConverter, ConversionValue>(getSubjectHolder(), EclipseLinkObjectTypeConverter.CONVERSION_VALUES_LIST) {
 			@Override
-			protected ListIterator<EclipseLinkConversionValue> listIterator_() {
+			protected ListIterator<ConversionValue> listIterator_() {
 				return this.subject.conversionValues();
 			}
 
@@ -330,9 +330,9 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 	}
 	
 	protected ListValueModel<String> buildDefaultObjectValueListHolder() {
-		return new TransformationListValueModelAdapter<EclipseLinkConversionValue, String>(buildConversionValuesListModel()) {
+		return new TransformationListValueModelAdapter<ConversionValue, String>(buildConversionValuesListModel()) {
 			@Override
-			protected String transformItem(EclipseLinkConversionValue conversionValue) {
+			protected String transformItem(ConversionValue conversionValue) {
 				return conversionValue.getObjectValue();
 			}
 		};
@@ -382,7 +382,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		
 		public String getColumnText(Object element, int columnIndex) {
 		
-			EclipseLinkConversionValue conversionValue = (EclipseLinkConversionValue) element;
+			ConversionValue conversionValue = (ConversionValue) element;
 			String value = null;
 			
 			switch (columnIndex) {
@@ -405,15 +405,15 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 		}
 	}
 
-	private static class ConversionValueColumnAdapter implements ColumnAdapter<EclipseLinkConversionValue> {
+	private static class ConversionValueColumnAdapter implements ColumnAdapter<ConversionValue> {
 
 		public static final int COLUMN_COUNT = 2;
 		//public static final int SELECTION_COLUMN = 0;
 		public static final int DATA_VALUE_COLUMN = 0;
 		public static final int OBJECT_VALUE_COLUMN = 1;
 
-		private WritablePropertyValueModel<String> buildDataValueHolder(EclipseLinkConversionValue subject) {
-			return new PropertyAspectAdapter<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.DATA_VALUE_PROPERTY, subject) {
+		private WritablePropertyValueModel<String> buildDataValueHolder(ConversionValue subject) {
+			return new PropertyAspectAdapter<ConversionValue, String>(ConversionValue.DATA_VALUE_PROPERTY, subject) {
 				@Override
 				protected String buildValue_() {
 					return this.subject.getDataValue();
@@ -426,8 +426,8 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 			};
 		}
 
-		private WritablePropertyValueModel<String> buildObjectValueHolder(EclipseLinkConversionValue subject) {
-			return new PropertyAspectAdapter<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY, subject) {
+		private WritablePropertyValueModel<String> buildObjectValueHolder(ConversionValue subject) {
+			return new PropertyAspectAdapter<ConversionValue, String>(ConversionValue.OBJECT_VALUE_PROPERTY, subject) {
 				@Override
 				protected String buildValue_() {
 					return this.subject.getObjectValue();
@@ -440,7 +440,7 @@ public class ObjectTypeConverterComposite extends FormPane<EclipseLinkObjectType
 			};
 		}
 
-		public WritablePropertyValueModel<?>[] cellModels(EclipseLinkConversionValue subject) {
+		public WritablePropertyValueModel<?>[] cellModels(ConversionValue subject) {
 			WritablePropertyValueModel<?>[] holders = new WritablePropertyValueModel<?>[COLUMN_COUNT];
 			//holders[SELECTION_COLUMN] = new SimplePropertyValueModel<Object>();
 			holders[DATA_VALUE_COLUMN]      = buildDataValueHolder(subject);
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/RefreshOnlyIfNewerComposite.java
index 0e6fc04cd6..2a135fbd73 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/RefreshOnlyIfNewerComposite.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.eclipselink.ui.internal.mappings.details;
 
-import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
+import org.eclipse.jpt.eclipselink.core.context.Caching;
 import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
  * @version 2.1
  * @since 2.1
  */
-public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
+public class RefreshOnlyIfNewerComposite extends FormPane<Caching>
 {
 	/**
 	 * Creates a new <code>OptionalComposite</code>.
@@ -38,14 +38,14 @@ 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 RefreshOnlyIfNewerComposite(FormPane<? extends Caching> parentPane,
 	                         Composite parent)
 	{
 		super(parentPane, parent);
 	}
 
 	private WritablePropertyValueModel<Boolean> buildRefreshOnlyIfNewerHolder() {
-		return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY) {
+		return new PropertyAspectAdapter<Caching, Boolean>(getSubjectHolder(), Caching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return this.subject.getSpecifiedRefreshOnlyIfNewer();