refactor tri-state checkbox aspect adapters

176 files changed, 1645 insertions, 2403 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
index 301b81a092..9fdf1c2c94 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java
@@ -121,7 +121,7 @@ public class NewNameDialog
 		}
 
 		private ModifiablePropertyValueModel<String> buildNameModel() {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 					this.getSubjectHolder(),
 					NewNameStateObject.NAME_PROPERTY,
 					NewNameStateObject.NAME_TRANSFORMER,
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
index bbc08efd6d..9f674cc3bc 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
@@ -1069,7 +1069,7 @@ public final class PropertyValueModelTools {
 	 * @param <OM> the type of the "outer" model
 	 */
 	public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundModelAdapterFactory(OM outerModel) {
-		return modelAspectAdapterFactory_(
+		return subjectModelAspectAdapterFactory_(
 				outerModel,
 				PropertyValueModel.VALUE,
 				valueTransformer()
@@ -1089,7 +1089,7 @@ public final class PropertyValueModelTools {
 	 * @param <OM> the type of the "outer" model
 	 */
 	public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundModelAdapterFactory_(OM outerModel) {
-		return modelAspectAdapterFactory_(
+		return subjectModelAspectAdapterFactory_(
 				outerModel,
 				PropertyValueModel.VALUE,
 				valueTransformer_()
@@ -1176,12 +1176,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> PropertyValueModel<Integer> modelAspectAdapter(
+	public static <S extends Model> PropertyValueModel<Integer> intSubjectAspectAdapter(
 			S subject,
 			String aspectName,
 			IntTransformer<? super S> transformer
 	) {
-		return modelAspectAdapter(subject, aspectName, TransformerTools.adapt(transformer));
+		return subjectAspectAdapter(subject, aspectName, TransformerTools.adapt(transformer));
 	}
 
 
@@ -1194,12 +1194,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> PropertyValueModel<Integer> modelAspectAdapter_(
+	public static <S extends Model> PropertyValueModel<Integer> intSubjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			IntTransformer<? super S> transformer
 	) {
-		return modelAspectAdapter_(subject, aspectName, TransformerTools.adapt(transformer));
+		return subjectAspectAdapter_(subject, aspectName, TransformerTools.adapt(transformer));
 	}
 
 	/**
@@ -1213,12 +1213,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> PropertyValueModel<Boolean> modelAspectAdapter(
+	public static <S extends Model> PropertyValueModel<Boolean> booleanSubjectAspectAdapter(
 			S subject,
 			String aspectName,
 			Predicate<? super S> predicate
 	) {
-		return modelAspectAdapter(subject, aspectName, TransformerTools.adapt(predicate));
+		return subjectAspectAdapter(subject, aspectName, TransformerTools.adapt(predicate));
 	}
 
 	/**
@@ -1230,12 +1230,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> PropertyValueModel<Boolean> modelAspectAdapter_(
+	public static <S extends Model> PropertyValueModel<Boolean> booleanSubjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			Predicate<? super S> predicate
 	) {
-		return modelAspectAdapter_(subject, aspectName, TransformerTools.adapt(predicate));
+		return subjectAspectAdapter_(subject, aspectName, TransformerTools.adapt(predicate));
 	}
 
 	/**
@@ -1249,12 +1249,12 @@ public final class PropertyValueModelTools {
 	 * @param <V> the type of the model's value
 	 * @param <S> the type of the subject
 	 */
-	public static <V, S extends Model> PropertyValueModel<V> modelAspectAdapter(
+	public static <V, S extends Model> PropertyValueModel<V> subjectAspectAdapter(
 			S subject,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return modelAspectAdapter(staticModel(subject), aspectName, transformer);
+		return subjectModelAspectAdapter(staticModel(subject), aspectName, transformer);
 	}
 
 	/**
@@ -1267,12 +1267,12 @@ public final class PropertyValueModelTools {
 	 * @param <V> the type of the model's value
 	 * @param <S> the type of the subject
 	 */
-	public static <V, S extends Model> PropertyValueModel<V> modelAspectAdapter_(
+	public static <V, S extends Model> PropertyValueModel<V> subjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return modelAspectAdapter_(staticModel(subject), aspectName, transformer);
+		return subjectModelAspectAdapter_(staticModel(subject), aspectName, transformer);
 	}
 
 	/**
@@ -1286,12 +1286,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Integer> modelAspectAdapter(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Integer> intSubjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			IntTransformer<? super S> transformer
 	) {
-		return modelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(transformer));
+		return subjectModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(transformer));
 	}
 
 	/**
@@ -1303,12 +1303,12 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Integer> modelAspectAdapter_(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Integer> intSubjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			IntTransformer<? super S> transformer
 	) {
-		return modelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(transformer));
+		return subjectModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(transformer));
 	}
 
 	/**
@@ -1323,12 +1323,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> modelAspectAdapter(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> booleanSubjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			Predicate<? super S> predicate
 	) {
-		return modelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(predicate));
+		return subjectModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(predicate));
 	}
 
 	/**
@@ -1341,12 +1341,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> modelAspectAdapter_(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> booleanSubjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			Predicate<? super S> predicate
 	) {
-		return modelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(predicate));
+		return subjectModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(predicate));
 	}
 
 	/**
@@ -1361,12 +1361,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> modelAspectAdapter(
+	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> subjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return propertyValueModel(modelAspectAdapterFactory(subjectModel, aspectName, transformer));
+		return propertyValueModel(subjectModelAspectAdapterFactory(subjectModel, aspectName, transformer));
 	}
 
 	/**
@@ -1380,12 +1380,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> modelAspectAdapter_(
+	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> subjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return propertyValueModel(modelAspectAdapterFactory_(subjectModel, aspectName, transformer));
+		return propertyValueModel(subjectModelAspectAdapterFactory_(subjectModel, aspectName, transformer));
 	}
 
 	/**
@@ -1400,12 +1400,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> modelAspectAdapterFactory(
+	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> subjectModelAspectAdapterFactory(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return modelAspectAdapterFactory_(subjectModel, aspectName, TransformerTools.nullCheck(transformer));
+		return subjectModelAspectAdapterFactory_(subjectModel, aspectName, TransformerTools.nullCheck(transformer));
 	}
 
 	/**
@@ -1419,12 +1419,12 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> modelAspectAdapterFactory_(
+	public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> subjectModelAspectAdapterFactory_(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> transformer
 	) {
-		return pluggableAspectAdapterFactory(subjectModel, new ModelPropertyAspectAdapter.Factory<>(aspectName, transformer));
+		return pluggableSubjectModelAspectAdapterFactory(subjectModel, new ModelPropertyAspectAdapter.Factory<>(aspectName, transformer));
 	}
 
 	/**
@@ -1435,11 +1435,11 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> aspectAdapter(
+	public static <V, S, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> subjectModelAspectAdapter(
 			SM subjectModel,
 			PluggablePropertyAspectAdapter.SubjectAdapter.Factory<V, S> subjectAdapterFactory
 	) {
-		return propertyValueModel(pluggableAspectAdapterFactory(subjectModel, subjectAdapterFactory));
+		return propertyValueModel(pluggableSubjectModelAspectAdapterFactory(subjectModel, subjectAdapterFactory));
 	}
 
 	/**
@@ -1450,7 +1450,7 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> pluggableAspectAdapterFactory(
+	public static <V, S, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> pluggableSubjectModelAspectAdapterFactory(
 			SM subjectModel,
 			PluggablePropertyAspectAdapter.SubjectAdapter.Factory<V, S> subjectAdapterFactory
 	) {
@@ -1473,13 +1473,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> ModifiablePropertyValueModel<Integer> modifiableModelAspectAdapter(
+	public static <S extends Model> ModifiablePropertyValueModel<Integer> modifiableIntSubjectAspectAdapter(
 			S subject,
 			String aspectName,
 			IntTransformer<? super S> getTransformer,
 			IntSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter(subject, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
+		return modifiableSubjectAspectAdapter(subject, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1493,13 +1493,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> ModifiablePropertyValueModel<Integer> modifiableModelAspectAdapter_(
+	public static <S extends Model> ModifiablePropertyValueModel<Integer> modifiableIntSubjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			IntTransformer<? super S> getTransformer,
 			IntSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter_(subject, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
+		return modifiableSubjectAspectAdapter_(subject, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1515,13 +1515,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter(
+	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableBooleanSubjectAspectAdapter(
 			S subject,
 			String aspectName,
 			Predicate<? super S> getPredicate,
 			BooleanSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+		return modifiableSubjectAspectAdapter(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1535,13 +1535,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter_(
+	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableBooleanSubjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			Predicate<? super S> getPredicate,
 			BooleanSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter_(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+		return modifiableSubjectAspectAdapter_(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1557,13 +1557,13 @@ public final class PropertyValueModelTools {
 	 * @param <V> the type of the model's value
 	 * @param <S> the type of the subject
 	 */
-	public static <V, S extends Model> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter(
+	public static <V, S extends Model> ModifiablePropertyValueModel<V> modifiableSubjectAspectAdapter(
 			S subject,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return modifiableModelAspectAdapter(staticModel(subject), aspectName, getTransformer, setClosure);
+		return modifiableSubjectModelAspectAdapter(staticModel(subject), aspectName, getTransformer, setClosure);
 	}
 
 	/**
@@ -1578,13 +1578,13 @@ public final class PropertyValueModelTools {
 	 * @param <V> the type of the model's value
 	 * @param <S> the type of the subject
 	 */
-	public static <V, S extends Model> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter_(
+	public static <V, S extends Model> ModifiablePropertyValueModel<V> modifiableSubjectAspectAdapter_(
 			S subject,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return modifiableModelAspectAdapter_(staticModel(subject), aspectName, getTransformer, setClosure);
+		return modifiableSubjectModelAspectAdapter_(staticModel(subject), aspectName, getTransformer, setClosure);
 	}
 
 	/**
@@ -1600,13 +1600,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Integer> modifiableModelAspectAdapter(
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Integer> modifiableIntSubjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			IntTransformer<? super S> getTransformer,
 			IntSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
+		return modifiableSubjectModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1620,13 +1620,13 @@ public final class PropertyValueModelTools {
 	 * 
 	 * @param <S> the type of the subject
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Integer> modifiableModelAspectAdapter_(
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Integer> modifiableIntSubjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			IntTransformer<? super S> getTransformer,
 			IntSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
+		return modifiableSubjectModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(getTransformer), intSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1643,13 +1643,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter(
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableBooleanSubjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			Predicate<? super S> getPredicate,
 			BooleanSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+		return modifiableSubjectModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1664,13 +1664,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter_(
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableBooleanSubjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			Predicate<? super S> getPredicate,
 			BooleanSetClosure<? super S> setClosure
 	) {
-		return modifiableModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+		return modifiableSubjectModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
 	}
 
 	/**
@@ -1687,13 +1687,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter(
+	public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableSubjectModelAspectAdapter(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return modifiableModel(modifiableModelAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
+		return modifiableModel(modifiableSubjectModelAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
 	}
 
 	/**
@@ -1709,13 +1709,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter_(
+	public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableSubjectModelAspectAdapter_(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return modifiableModel(modifiableModelAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
+		return modifiableModel(modifiableSubjectModelAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
 	}
 
 	/**
@@ -1732,13 +1732,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableModelAspectAdapterFactory(
+	public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableSubjectModelAspectAdapterFactory(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return pluggableModifiableAspectAdapterFactory(modelAspectAdapterFactory(subjectModel, aspectName, getTransformer), setClosure);
+		return pluggableModifiableAspectAdapterFactory(subjectModelAspectAdapterFactory(subjectModel, aspectName, getTransformer), setClosure);
 	}
 
 	/**
@@ -1754,13 +1754,13 @@ public final class PropertyValueModelTools {
 	 * @param <S> the type of the subject
 	 * @param <SM> the type of the subject model
 	 */
-	public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableModelAspectAdapterFactory_(
+	public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableSubjectModelAspectAdapterFactory_(
 			SM subjectModel,
 			String aspectName,
 			Transformer<? super S, ? extends V> getTransformer,
 			BiClosure<? super S, ? super V> setClosure
 	) {
-		return pluggableModifiableAspectAdapterFactory_(modelAspectAdapterFactory_(subjectModel, aspectName, getTransformer), setClosure);
+		return pluggableModifiableAspectAdapterFactory_(subjectModelAspectAdapterFactory_(subjectModel, aspectName, getTransformer), setClosure);
 	}
 
 	/**
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
index 72453f4f21..25b9028404 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
@@ -345,11 +345,11 @@ public class TreeLabelProviderUiTest
 	}
 
 	/* CU private */ static PropertyValueModel<ImageDescriptor> buildImageDescriptorModel(Vehicle vehicle) {
-		return PropertyValueModelTools.modelAspectAdapter(vehicle, Vehicle.IMAGE_DESCRIPTOR_PROPERTY, Vehicle.IMAGE_DESCRIPTOR_TRANSFORMER);
+		return PropertyValueModelTools.subjectAspectAdapter(vehicle, Vehicle.IMAGE_DESCRIPTOR_PROPERTY, Vehicle.IMAGE_DESCRIPTOR_TRANSFORMER);
 	}
 
 	/* CU private */ static PropertyValueModel<String> buildTextModel(Vehicle vehicle) {
-		return PropertyValueModelTools.modelAspectAdapter(vehicle, Vehicle.TEXT_PROPERTY, Vehicle.TEXT_TRANSFORMER);
+		return PropertyValueModelTools.subjectAspectAdapter(vehicle, Vehicle.TEXT_PROPERTY, Vehicle.TEXT_TRANSFORMER);
 	}
 
 	/* CU private */ static PropertyValueModel<String> buildDescriptionModel(Vehicle vehicle) {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
index a99098d92d..b64a788ac2 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
@@ -84,7 +84,7 @@ public abstract class AbstractComboModelAdapterTest {
 	}
 
 	private ModifiablePropertyValueModel<SimpleDisplayable> buildSelectedItemHolder() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.subjectHolder,
 				Model.ITEM_PROPERTY,
 				Model.ITEM_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
index 3b1b40320c..62c124d91c 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
@@ -41,7 +41,7 @@ public class SpinnerModelAdapterTest {
 	}
 
 	private ModifiablePropertyValueModel<Integer> buildValueHolder() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.subjectHolder,
 				Model.VALUE_PROPERTY,
 				Model.VALUE_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
index 292fe887c9..38f64291ce 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
@@ -1132,7 +1132,7 @@ public class TableModelAdapterTest {
 		static final int TITLE_COLUMN = 1;
 
 		private ModifiablePropertyValueModel<String> buildManagerHolder(Employee subject) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					subject,
 					Employee.MANAGER_PROPERTY,
 					Employee.MANAGER_TRANSFORMER,
@@ -1141,7 +1141,7 @@ public class TableModelAdapterTest {
 		}
 
 		private ModifiablePropertyValueModel<String> buildNameHolder(Employee subject) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					subject,
 					Employee.NAME_PROPERTY,
 					Employee.NAME_TRANSFORMER,
@@ -1150,7 +1150,7 @@ public class TableModelAdapterTest {
 		}
 
 		private ModifiablePropertyValueModel<String> buildTitleHolder(Employee subject) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					subject,
 					Employee.TITLE_PROPERTY,
 					Employee.TITLE_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
index a52b9674ad..9fa6b1d1ec 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
@@ -67,7 +67,7 @@ public class TriStateCheckBoxModelAdapterUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectHolder,
 				TestModel.FLAG1_PROPERTY,
 				TestModel.FLAG1_TRANSFORMER,
@@ -76,7 +76,7 @@ public class TriStateCheckBoxModelAdapterUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectHolder,
 				TestModel.FLAG2_PROPERTY,
 				TestModel.FLAG2_TRANSFORMER,
@@ -85,7 +85,7 @@ public class TriStateCheckBoxModelAdapterUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectHolder,
 				TestModel.NOT_FLAG2_PROPERTY,
 				TestModel.NOT_FLAG2_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
index 60bc464796..03d5e5cd8f 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
@@ -70,7 +70,7 @@ public class CheckBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag1Model(PropertyValueModel<TestModel> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				subjectModel,
 				TestModel.FLAG1_PROPERTY,
 				TestModel.FLAG1_PREDICATE,
@@ -79,7 +79,7 @@ public class CheckBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag2Model(PropertyValueModel<TestModel> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				subjectModel,
 				TestModel.FLAG2_PROPERTY,
 				TestModel.FLAG2_PREDICATE,
@@ -88,7 +88,7 @@ public class CheckBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildNotFlag2Model(PropertyValueModel<TestModel> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				subjectModel,
 				TestModel.NOT_FLAG2_PROPERTY,
 				TestModel.NOT_FLAG2_PREDICATE,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
index 8e4c18d73d..14dce1be9a 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
@@ -72,7 +72,7 @@ public class ComboBoxModelBindingUITest
 		this.nameListModel = this.buildNameListModel();
 		this.testModel = new TestModel(DEFAULT_NAME);
 		this.testModelModel = new SimplePropertyValueModel<>(this.testModel);
-		this.nameModel = PropertyValueModelTools.modifiableModelAspectAdapter(this.testModelModel, TestModel.NAME_PROPERTY, TestModel.NAME_TRANSFORMER, TestModel.SET_NAME_CLOSURE);
+		this.nameModel = PropertyValueModelTools.modifiableSubjectModelAspectAdapter(this.testModelModel, TestModel.NAME_PROPERTY, TestModel.NAME_TRANSFORMER, TestModel.SET_NAME_CLOSURE);
 		this.allCapsNameModel = PropertyValueModelTools.transform(this.nameModel, UPPER_CASE_TRANSFORMER);
 
 		this.nameListSelectionModel = new SimplePropertyValueModel<>();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
index 8200191541..7cca02ef41 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
@@ -270,7 +270,7 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<Task> buildPriorityTaskAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.taskListModel,
 				TaskList.PRIORITY_TASK_PROPERTY,
 				TaskList.PRIORITY_TASK_TRANSFORMER,
@@ -279,7 +279,7 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<String> buildPriorityTaskNameAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.taskListModel,
 				TaskList.PRIORITY_TASK_NAME_PROPERTY,
 				TaskList.PRIORITY_TASK_NAME_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
index 0bd7c9cc30..8b6b7ef2b2 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
@@ -67,7 +67,7 @@ public class TextFieldModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.NAME_PROPERTY,
 				TestModel.NAME_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
index a043dedf62..3639035ae7 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
@@ -81,7 +81,7 @@ public class BufferedPropertyValueModelTests
 	}
 
 	private ModifiablePropertyValueModel<Integer> buildIDModel(PropertyValueModel<Employee> eHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				eHolder,
 				Employee.ID_PROPERTY,
 				Employee.ID_TRANSFORMER,
@@ -90,7 +90,7 @@ public class BufferedPropertyValueModelTests
 	}
 
 	private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<Employee> eHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				eHolder,
 				Employee.NAME_PROPERTY,
 				Employee.NAME_TRANSFORMER,
@@ -99,7 +99,7 @@ public class BufferedPropertyValueModelTests
 	}
 
 	private ModifiablePropertyValueModel<Date> buildHireDateModel(PropertyValueModel<Employee> eHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				eHolder,
 				Employee.HIRE_DATE_PROPERTY,
 				Employee.HIRE_DATE_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
index d1f5e9892d..cb4d7c4f9d 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
@@ -58,7 +58,7 @@ public class PropertyAspectAdapterTests
 	}
 
 	private ModifiablePropertyValueModel<String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectHolder,
 				TestSubject.NAME_PROPERTY,
 				TestSubject.NAME_TRANSFORMER,
@@ -234,7 +234,7 @@ public class PropertyAspectAdapterTests
 	}
 
 	private ModifiablePropertyValueModel<String> buildCustomAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter_(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter_(
 				subjectHolder,
 				TestSubject.NAME_PROPERTY,
 				TestSubject.CUSTOM_NAME_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
index fc3f0f3afd..f742260837 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
@@ -73,7 +73,7 @@ public class CheckBoxModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				vm,
 				TestModel.FLAG1_PROPERTY,
 				TestModel.FLAG1_PREDICATE,
@@ -82,7 +82,7 @@ public class CheckBoxModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				vm,
 				TestModel.FLAG2_PROPERTY,
 				TestModel.FLAG2_PREDICATE,
@@ -91,7 +91,7 @@ public class CheckBoxModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				vm,
 				TestModel.NOT_FLAG2_PROPERTY,
 				TestModel.NOT_FLAG2_PREDICATE,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
index b78d5cfc91..47468c3ac9 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
@@ -86,7 +86,7 @@ public class ComboBoxModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildColorHolder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.COLOR_PROPERTY,
 				TestModel.COLOR_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
index 69c4953495..3d4ed49409 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
@@ -70,7 +70,7 @@ public class DocumentAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.NAME_PROPERTY,
 				TestModel.NAME_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
index 6eaeb1cf5a..6ddcb5cda2 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
@@ -69,7 +69,7 @@ public class RadioButtonModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<String> buildColorModel(PropertyValueModel<ColoredThing> ctm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				ctm,
 				ColoredThing.COLOR_PROPERTY,
 				ColoredThing.COLOR_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
index 89045796c1..728693e2f6 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
@@ -84,7 +84,7 @@ public class SpinnerModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildBirthDateHolder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.BIRTH_DATE_PROPERTY,
 				TestModel.BIRTH_DATE_TRANSFORMER,
@@ -97,7 +97,7 @@ public class SpinnerModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Number> buildAgeHolder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.AGE_PROPERTY,
 				TestModel.AGE_TRANSFORMER,
@@ -110,7 +110,7 @@ public class SpinnerModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildEyeColorHolder(PropertyValueModel<TestModel> vm) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				vm,
 				TestModel.EYE_COLOR_PROPERTY,
 				TestModel.EYE_COLOR_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
index 2b86ef9d7f..31ab39e0c8 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
@@ -323,7 +323,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildNameAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.NAME_PROPERTY,
 					Person.NAME_TRANSFORMER,
@@ -332,7 +332,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildBirthDateAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.BIRTH_DATE_PROPERTY,
 					Person.BIRTH_DATE_TRANSFORMER,
@@ -341,7 +341,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.GONE_WEST_DATE_PROPERTY,
 					Person.GONE_WEST_DATE_TRANSFORMER,
@@ -350,7 +350,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildEyeColorAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.EYE_COLOR_PROPERTY,
 					Person.EYE_COLOR_TRANSFORMER,
@@ -359,7 +359,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildEvilAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.EVIL_PROPERTY,
 					TransformerTools.adapt(Person.EVIL_PREDICATE),
@@ -368,7 +368,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildRankAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.RANK_PROPERTY,
 					Person.RANK_TRANSFORMER,
@@ -377,7 +377,7 @@ public class TableModelAdapterTests
 		}
 	
 		private ModifiablePropertyValueModel<Object> buildAdventureCountAdapter(Person person) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					person,
 					Person.ADVENTURE_COUNT_PROPERTY,
 					Person.ADVENTURE_COUNT_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
index 93a248d793..47c4a31b67 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
@@ -531,7 +531,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<String> buildNameAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.NAME_PROPERTY,
 				Person.NAME_TRANSFORMER,
@@ -551,7 +551,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildBirthDateAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.BIRTH_DATE_PROPERTY,
 				Person.BIRTH_DATE_TRANSFORMER,
@@ -571,7 +571,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.GONE_WEST_DATE_PROPERTY,
 				Person.GONE_WEST_DATE_TRANSFORMER,
@@ -591,7 +591,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Object> buildEyeColorAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.EYE_COLOR_PROPERTY,
 				Person.EYE_COLOR_TRANSFORMER,
@@ -614,7 +614,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildEvilAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.EVIL_PROPERTY,
 				TransformerTools.adapt(Person.EVIL_PREDICATE),
@@ -634,7 +634,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Number> buildRankAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.RANK_PROPERTY,
 				Person.RANK_TRANSFORMER,
@@ -654,7 +654,7 @@ public class TableModelAdapterUITest {
 	}
 
 	private ModifiablePropertyValueModel<Number> buildAdventureCountAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.ADVENTURE_COUNT_PROPERTY,
 				Person.ADVENTURE_COUNT_TRANSFORMER,
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
index aabfe7d5ea..7dbc421b47 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
@@ -737,7 +737,7 @@ public class TreeModelAdapterTests extends TestCase {
 			};
 		}
 		protected ModifiablePropertyValueModel<String> buildNameAdapter() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 				this.getTestModel(),
 				TestModel.NAME_PROPERTY,
 				TestModel.NAME_TRANSFORMER,
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java
index 1e9f62af01..0bbcc7af51 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java
@@ -94,7 +94,7 @@ public class ELJaxbNavigatorItemContentProviderFactory
 	protected CollectionValueModel<JaxbContextNode> buildOxmFileChildrenModel(final ELJaxbPackage jaxbPackage) {

 		return new FilteringCollectionValueModel<JaxbContextNode>(

 				new PropertyCollectionValueModelAdapter<JaxbContextNode>(

-						PropertyValueModelTools.modelAspectAdapter(

+						PropertyValueModelTools.subjectAspectAdapter(

 								jaxbPackage,

 								ELJaxbPackage.OXM_FILE_PROPERTY,

 								ELJaxbPackage.OXM_FILE_TRANSFORMER

@@ -169,7 +169,7 @@ public class ELJaxbNavigatorItemContentProviderFactory
 	}

 	

 	protected PropertyValueModel<OxmXmlBindings> buildXmlBindingsModel(OxmFile oxmFile) {

-		return PropertyValueModelTools.modelAspectAdapter(

+		return PropertyValueModelTools.subjectAspectAdapter(

 				oxmFile,

 				OxmFile.XML_BINDINGS_PROPERTY,

 				OxmFile.XML_BINDINGS_TRANSFORMER

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
index 7e98d1caf5..38b9ec7a4d 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java
@@ -126,7 +126,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<TypeName> buildOxmTypeMappingNameModel(OxmTypeMapping item) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				item,
 				OxmTypeMapping.TYPE_NAME_PROPERTY,
 				OxmTypeMapping.TYPE_NAME_TRANSFORMER
@@ -174,7 +174,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<JaxbAttributeMapping> buildOxmJavaAttributeMappingModel(OxmJavaAttribute item) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				item,
 				JaxbPersistentAttribute.MAPPING_PROPERTY,
 				JaxbPersistentAttribute.MAPPING_TRANSFORMER
@@ -182,7 +182,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
 	}
 	
 	protected PropertyValueModel<String> buildOxmJavaAttributeTextModel(OxmJavaAttribute item) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				item,
 				OxmJavaAttribute.JAVA_ATTRIBUTE_NAME_PROPERTY,
 				OxmJavaAttribute.JAVA_ATTRIBUTE_NAME_TRANSFORMER
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java
index 82cf53a38a..ffee1f4ac4 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java
@@ -125,7 +125,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 	
 	protected PropertyValueModel<JavaClassMapping> buildMappingModel(JavaClass javaClass) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				javaClass,
 				JavaType.MAPPING_PROPERTY,
 				JavaClass.MAPPING_TRANSFORMER
@@ -168,7 +168,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<JavaEnumMapping> buildMappingModel(JavaEnum javaEnum) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				javaEnum,
 				JavaType.MAPPING_PROPERTY,
 				JavaEnum.MAPPING_TRANSFORMER
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java
index 3878ffc727..c4321723b8 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java
@@ -180,7 +180,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 		}
 		
 		protected PropertyValueModel<XmlRegistry> buildXmlRegistryModel() {
-			return PropertyValueModelTools.modelAspectAdapter(
+			return PropertyValueModelTools.subjectAspectAdapter(
 					this.javaClass,
 					JavaClass.XML_REGISTRY_PROPERTY,
 					JavaClass.XML_REGISTRY_TRANSFORMER
@@ -188,7 +188,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 		}
 		
 		protected PropertyValueModel<JavaClassMapping> buildMappingModel() {
-			return PropertyValueModelTools.modelAspectAdapter(
+			return PropertyValueModelTools.subjectAspectAdapter(
 					this.javaClass,
 					JavaType.MAPPING_PROPERTY,
 					JavaClass.MAPPING_TRANSFORMER
@@ -196,7 +196,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 		}
 		
 		protected PropertyValueModel<Boolean> buildXmlTransientModel() {
-			return PropertyValueModelTools.modelAspectAdapter(
+			return PropertyValueModelTools.booleanSubjectModelAspectAdapter(
 					this.mappingModel,
 					JaxbTypeMapping.XML_TRANSIENT_PROPERTY,
 					JaxbTypeMapping.XML_TRANSIENT_PREDICATE
@@ -346,7 +346,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 		
 		
 		protected PropertyValueModel<JavaEnumMapping> buildMappingModel() {
-			return PropertyValueModelTools.modelAspectAdapter(
+			return PropertyValueModelTools.subjectAspectAdapter(
 					this.javaEnum,
 					JavaType.MAPPING_PROPERTY,
 					JavaEnum.MAPPING_TRANSFORMER
@@ -363,7 +363,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 		}
 		
 		protected PropertyValueModel<Boolean> buildXmlTransientModel() {
-			return PropertyValueModelTools.modelAspectAdapter(
+			return PropertyValueModelTools.booleanSubjectModelAspectAdapter(
 					this.mappingModel,
 					JaxbTypeMapping.XML_TRANSIENT_PROPERTY,
 					JaxbTypeMapping.XML_TRANSIENT_PREDICATE
@@ -486,7 +486,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
 	}
 
 	public PropertyValueModel<JaxbAttributeMapping> buildJavaPersistentAttributeMappingModel(JavaPersistentAttribute item) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				item,
 				JaxbPersistentAttribute.MAPPING_PROPERTY,
 				JaxbPersistentAttribute.MAPPING_TRANSFORMER
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
index ca85850e5e..2767edac05 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java
@@ -708,7 +708,7 @@ public class JaxbSchemasPropertiesPage
 		}
 		
 		private ModifiablePropertyValueModel<String> buildNamespaceCellModel(Schema subject) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					subject,
 					Schema.NAMESPACE_PROPERTY,
 					Schema.NAMESPACE_TRANSFORMER,
@@ -717,7 +717,7 @@ public class JaxbSchemasPropertiesPage
 		}
 		
 		private ModifiablePropertyValueModel<String> buildLocationCellModel(Schema subject) {
-			return PropertyValueModelTools.modifiableModelAspectAdapter(
+			return PropertyValueModelTools.modifiableSubjectAspectAdapter(
 					subject,
 					Schema.LOCATION_PROPERTY,
 					Schema.LOCATION_TRANSFORMER,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseColumn.java
index e26fd4a53b..e7de91aea3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/BaseColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -32,7 +32,7 @@ public interface BaseColumn
 	boolean isUnique();
 	Boolean getSpecifiedUnique();
 		String SPECIFIED_UNIQUE_PROPERTY = "specifiedUnique"; //$NON-NLS-1$
-	boolean isDefaultUnique();
+	boolean getDefaultUnique();
 		String DEFAULT_UNIQUE_PROPERTY = "defaultUnique"; //$NON-NLS-1$
 	boolean DEFAULT_UNIQUE = false;
 
@@ -46,7 +46,7 @@ public interface BaseColumn
 	boolean isNullable();
 	Boolean getSpecifiedNullable();
 		String SPECIFIED_NULLABLE_PROPERTY = "specifiedNullable"; //$NON-NLS-1$
-	boolean isDefaultNullable();
+	boolean getDefaultNullable();
 		String DEFAULT_NULLABLE_PROPERTY = "defaultNullable"; //$NON-NLS-1$
 	boolean DEFAULT_NULLABLE = true;
 
@@ -60,7 +60,7 @@ public interface BaseColumn
 	boolean isInsertable();
 	Boolean getSpecifiedInsertable();
 		String SPECIFIED_INSERTABLE_PROPERTY = "specifiedInsertable"; //$NON-NLS-1$
-	boolean isDefaultInsertable();
+	boolean getDefaultInsertable();
 		String DEFAULT_INSERTABLE_PROPERTY = "defaultInsertable"; //$NON-NLS-1$
 	boolean DEFAULT_INSERTABLE = true;
 
@@ -74,7 +74,7 @@ public interface BaseColumn
 	boolean isUpdatable();
 	Boolean getSpecifiedUpdatable();
 		String SPECIFIED_UPDATABLE_PROPERTY = "specifiedUpdatable"; //$NON-NLS-1$
-	boolean isDefaultUpdatable();
+	boolean getDefaultUpdatable();
 		String DEFAULT_UPDATABLE_PROPERTY = "defaultUpdatable"; //$NON-NLS-1$
 	boolean DEFAULT_UPDATABLE = true;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OptionalMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OptionalMapping.java
index 0707763858..7e6b82f7aa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OptionalMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OptionalMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -29,13 +29,11 @@ public interface OptionalMapping
 	extends AttributeMapping
 {
 	boolean isOptional();
-	
-	boolean isDefaultOptional();
-		String DEFAULT_OPTIONAL_PROPERTY = "defaultOptional"; //$NON-NLS-1$
-		boolean DEFAULT_OPTIONAL = true;
-	
 	Boolean getSpecifiedOptional();
 	void setSpecifiedOptional(Boolean newSpecifiedOptional);
 		String SPECIFIED_OPTIONAL_PROPERTY = "specifiedOptional"; //$NON-NLS-1$
+	boolean getDefaultOptional();
+		String DEFAULT_OPTIONAL_PROPERTY = "defaultOptional"; //$NON-NLS-1$
+		boolean DEFAULT_OPTIONAL = true;
 	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTypeMapping.java
index efbab98634..159d74976d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -43,7 +43,7 @@ public interface OrmTypeMapping
 	 * Override metadata complete is true if the type mapping's persistence
 	 * unit is marked "XML mapping metadata complete".
 	 */
-	boolean isOverrideMetadataComplete();
+	boolean getOverrideMetadataComplete();
 		String OVERRIDE_METADATA_COMPLETE_PROPERTY = "overrideMetadataComplete"; //$NON-NLS-1$
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java
index c939462dc8..7c18e6f6ef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -140,7 +140,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 	// ********** unique **********
 
 	public boolean isUnique() {
-		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.isDefaultUnique();
+		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.getDefaultUnique();
 	}
 
 	public Boolean getSpecifiedUnique() {
@@ -165,7 +165,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 		return columnAnnotation.getUnique();
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 		return this.defaultUnique;
 	}
 
@@ -183,7 +183,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -208,7 +208,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 		return columnAnnotation.getNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return this.defaultNullable;
 	}
 
@@ -226,7 +226,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -251,7 +251,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 		return columnAnnotation.getInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return this.defaultInsertable;
 	}
 
@@ -269,7 +269,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -294,7 +294,7 @@ public abstract class AbstractJavaBaseColumn<PA extends TableColumn.ParentAdapte
 		return columnAnnotation.getUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return this.defaultUpdatable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
index 21a58c8bc0..fcf8d1a7c6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -153,7 +153,7 @@ public abstract class AbstractJavaBasicMapping
 	// ********** optional **********
 
 	public boolean isOptional() {
-		return (this.specifiedOptional != null) ? this.specifiedOptional.booleanValue() : this.isDefaultOptional();
+		return (this.specifiedOptional != null) ? this.specifiedOptional.booleanValue() : this.getDefaultOptional();
 	}
 
 	public Boolean getSpecifiedOptional() {
@@ -178,7 +178,7 @@ public abstract class AbstractJavaBasicMapping
 		return (annotation == null) ? null : annotation.getOptional();
 	}
 
-	public boolean isDefaultOptional() {
+	public boolean getDefaultOptional() {
 		return this.defaultOptional;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
index 9545220d3d..a1710fa95f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -86,7 +86,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela
 		return (annotation == null) ? null : annotation.getOptional();
 	}
 
-	public boolean isDefaultOptional() {
+	public boolean getDefaultOptional() {
 		return this.defaultOptional;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java
index 01bca9e45c..9e72f20eb6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -102,7 +102,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 	// ********** unique **********
 
 	public boolean isUnique() {
-		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.isDefaultUnique();
+		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.getDefaultUnique();
 	}
 
 	public Boolean getSpecifiedUnique() {
@@ -119,7 +119,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 		return this.getOverriddenColumn().getSpecifiedUnique();
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 		return this.defaultUnique;
 	}
 
@@ -137,7 +137,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -154,7 +154,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 		return this.getOverriddenColumn().getSpecifiedNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return this.defaultNullable;
 	}
 
@@ -172,7 +172,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -189,7 +189,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 		return this.getOverriddenColumn().getSpecifiedInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return this.defaultInsertable;
 	}
 
@@ -207,7 +207,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -224,7 +224,7 @@ public abstract class AbstractJavaVirtualBaseColumn<PA extends TableColumn.Paren
 		return this.getOverriddenColumn().getSpecifiedUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return this.defaultUpdatable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
index 928cb2535e..93939803f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -121,7 +121,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 	// ********** unique **********
 
 	public boolean isUnique() {
-		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.isDefaultUnique();
+		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.getDefaultUnique();
 	}
 
 	public Boolean getSpecifiedUnique() {
@@ -148,7 +148,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 		return (xmlColumn == null) ? null : xmlColumn.getUnique();
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 		return DEFAULT_UNIQUE;
 	}
 
@@ -156,7 +156,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -183,7 +183,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 		return (xmlColumn == null) ? null : xmlColumn.getNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return DEFAULT_NULLABLE;
 	}
 
@@ -191,7 +191,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -218,7 +218,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 		return (xmlColumn == null) ? null : xmlColumn.getInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return DEFAULT_INSERTABLE;
 	}
 
@@ -226,7 +226,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -253,7 +253,7 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
 		return (xmlColumn == null) ? null : xmlColumn.getUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return DEFAULT_UPDATABLE;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
index 7d41b38f42..2ba453cbd4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -151,7 +151,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
 	// ********** optional **********
 
 	public boolean isOptional() {
-		return (this.specifiedOptional != null) ? this.specifiedOptional.booleanValue() : this.isDefaultOptional();
+		return (this.specifiedOptional != null) ? this.specifiedOptional.booleanValue() : this.getDefaultOptional();
 	}
 
 	public Boolean getSpecifiedOptional() {
@@ -173,7 +173,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
 		return this.xmlAttributeMapping.getOptional();
 	}
 
-	public boolean isDefaultOptional() {
+	public boolean getDefaultOptional() {
 		return this.defaultOptional;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
index 4a9d2e7b3a..d2f43d5f94 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -79,7 +79,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<X extends AbstractXml
 		this.firePropertyChanged(SPECIFIED_OPTIONAL_PROPERTY, old, optional);
 	}
 
-	public boolean isDefaultOptional() {
+	public boolean getDefaultOptional() {
 		return this.defaultOptional;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
index f1abac742b..3bd0875b80 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
@@ -114,7 +114,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
 		this.firePropertyChanged(SPECIFIED_METADATA_COMPLETE_PROPERTY, old, metadataComplete);
 	}
 
-	public boolean isOverrideMetadataComplete() {
+	public boolean getOverrideMetadataComplete() {
 		return this.overrideMetadataComplete;
 	}
 
@@ -253,7 +253,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
 	 */
 	public void initializeFrom(OrmTypeMapping oldMapping) {
 		this.setSpecifiedMetadataComplete(oldMapping.getSpecifiedMetadataComplete());
-		this.setOverrideMetadataComplete(oldMapping.isOverrideMetadataComplete());
+		this.setOverrideMetadataComplete(oldMapping.getOverrideMetadataComplete());
 	}
 
 	public X getXmlTypeMapping() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java
index d6133f52e8..82a0237187 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -101,7 +101,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 	// ********** unique **********
 
 	public boolean isUnique() {
-		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.isDefaultUnique();
+		return (this.specifiedUnique != null) ? this.specifiedUnique.booleanValue() : this.getDefaultUnique();
 	}
 
 	public Boolean getSpecifiedUnique() {
@@ -118,7 +118,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 		return this.getOverriddenColumn().getSpecifiedUnique();
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 		return this.defaultUnique;
 	}
 
@@ -136,7 +136,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -153,7 +153,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 		return this.getOverriddenColumn().getSpecifiedNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return this.defaultNullable;
 	}
 
@@ -171,7 +171,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -188,7 +188,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 		return this.getOverriddenColumn().getSpecifiedInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return this.defaultInsertable;
 	}
 
@@ -206,7 +206,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -223,7 +223,7 @@ public abstract class AbstractOrmVirtualBaseColumn<PA extends TableColumn.Parent
 		return this.getOverriddenColumn().getSpecifiedUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return this.defaultUpdatable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
index e998f8403a..edfed894be 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -96,7 +96,7 @@ public class GenericJavaCacheable2_0
 		return (value != null) ? value : Boolean.TRUE;
 	}
 
-	public boolean isDefaultCacheable() {
+	public boolean getDefaultCacheable() {
 		return this.defaultCacheable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
index b8096701cf..63cb49499c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -86,7 +86,7 @@ public class GenericJavaOrderColumn2_0
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -111,7 +111,7 @@ public class GenericJavaOrderColumn2_0
 		return columnAnnotation.getNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return this.defaultNullable;
 	}
 
@@ -129,7 +129,7 @@ public class GenericJavaOrderColumn2_0
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -154,7 +154,7 @@ public class GenericJavaOrderColumn2_0
 		return columnAnnotation.getInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return this.defaultInsertable;
 	}
 
@@ -172,7 +172,7 @@ public class GenericJavaOrderColumn2_0
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -197,7 +197,7 @@ public class GenericJavaOrderColumn2_0
 		return columnAnnotation.getUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return this.defaultUpdatable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
index 1b0cbeb9cf..0372a9bc90 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -78,7 +78,7 @@ public class GenericJavaOrphanRemoval2_0
 		return (annotation == null) ? null : annotation.getOrphanRemoval();
 	}
 
-	public boolean isDefaultOrphanRemoval() {
+	public boolean getDefaultOrphanRemoval() {
 		return this.defaultOrphanRemoval;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java
index 0ad36bd1b0..ed8b1566f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -40,7 +40,7 @@ public class NullJavaCacheable2_0
 		throw new UnsupportedOperationException();
 	}
 	
-	public boolean isDefaultCacheable() {
+	public boolean getDefaultCacheable() {
 		return false;
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java
index a6fbbc62fd..3993a43138 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -103,7 +103,7 @@ public class NullJavaMapKeyColumn2_0
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 		return false;
 	}
 
@@ -122,7 +122,7 @@ public class NullJavaMapKeyColumn2_0
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return false;
 	}
 
@@ -141,7 +141,7 @@ public class NullJavaMapKeyColumn2_0
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return false;
 	}
 
@@ -160,7 +160,7 @@ public class NullJavaMapKeyColumn2_0
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java
index 465e78bf30..6135969afe 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -36,7 +36,7 @@ public class NullJavaOrphanRemoval2_0
 		return null;
 	}
 
-	public boolean isDefaultOrphanRemoval() {
+	public boolean getDefaultOrphanRemoval() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
index 76406402e4..03331ba8b5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -69,7 +69,7 @@ public class GenericOrmCacheable2_0
 		this.firePropertyChanged(SPECIFIED_CACHEABLE_PROPERTY, old, cacheable);
 	}
 
-	public boolean isDefaultCacheable() {
+	public boolean getDefaultCacheable() {
 		return this.defaultCacheable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
index 6cb849bf90..d50f7da586 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -70,7 +70,7 @@ public class GenericOrmOrderColumn2_0
 	// ********** nullable **********
 
 	public boolean isNullable() {
-		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.isDefaultNullable();
+		return (this.specifiedNullable != null) ? this.specifiedNullable.booleanValue() : this.getDefaultNullable();
 	}
 
 	public Boolean getSpecifiedNullable() {
@@ -97,7 +97,7 @@ public class GenericOrmOrderColumn2_0
 		return (xmlColumn == null) ? null : xmlColumn.getNullable();
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 		return DEFAULT_NULLABLE;
 	}
 
@@ -105,7 +105,7 @@ public class GenericOrmOrderColumn2_0
 	// ********** insertable **********
 
 	public boolean isInsertable() {
-		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.isDefaultInsertable();
+		return (this.specifiedInsertable != null) ? this.specifiedInsertable.booleanValue() : this.getDefaultInsertable();
 	}
 
 	public Boolean getSpecifiedInsertable() {
@@ -132,7 +132,7 @@ public class GenericOrmOrderColumn2_0
 		return (xmlColumn == null) ? null : xmlColumn.getInsertable();
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 		return DEFAULT_INSERTABLE;
 	}
 
@@ -140,7 +140,7 @@ public class GenericOrmOrderColumn2_0
 	// ********** updatable **********
 
 	public boolean isUpdatable() {
-		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.isDefaultUpdatable();
+		return (this.specifiedUpdatable != null) ? this.specifiedUpdatable.booleanValue() : this.getDefaultUpdatable();
 	}
 
 	public Boolean getSpecifiedUpdatable() {
@@ -167,7 +167,7 @@ public class GenericOrmOrderColumn2_0
 		return (xmlColumn == null) ? null : xmlColumn.getUpdatable();
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 		return DEFAULT_UPDATABLE;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
index 1052aa9e20..9886fb0b49 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -75,7 +75,7 @@ public class GenericOrmOrphanRemoval2_0
 		return this.getXmlOrphanRemovable().getOrphanRemoval();
 	}
 
-	public boolean isDefaultOrphanRemoval() {
+	public boolean getDefaultOrphanRemoval() {
 		return this.defaultOrphanRemoval;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java
index 715d3d2eae..0703cc46a8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -40,7 +40,7 @@ public class NullOrmCacheable2_0
 		throw new UnsupportedOperationException();
 	}
 
-	public boolean isDefaultCacheable() {
+	public boolean getDefaultCacheable() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java
index b6b442b792..1ed6a927fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -28,7 +28,7 @@ public class NullOrmOrphanRemoval2_0
 
 	// ********** orphan removal **********
 
-	public boolean isDefaultOrphanRemoval() {
+	public boolean getDefaultOrphanRemoval() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/GenericConnection2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/GenericConnection2_0.java
index 79fc2cd8c8..251f4bc2ff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/GenericConnection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/GenericConnection2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -119,7 +119,7 @@ public class GenericConnection2_0
 	}
 
 	public String getDefaultDriver() {
-		return DEFAULT_JDBC_DRIVER;
+		return DEFAULT_DRIVER;
 	}
 
 	// ********** URL **********
@@ -141,7 +141,7 @@ public class GenericConnection2_0
 	}
 
 	public String getDefaultUrl() {
-		return DEFAULT_JDBC_URL;
+		return DEFAULT_URL;
 	}
 
 	// ********** User **********
@@ -163,7 +163,7 @@ public class GenericConnection2_0
 	}
 
 	public String getDefaultUser() {
-		return DEFAULT_JDBC_USER;
+		return DEFAULT_USER;
 	}
 
 	// ********** Password **********
@@ -185,6 +185,6 @@ public class GenericConnection2_0
 	}
 
 	public String getDefaultPassword() {
-		return DEFAULT_JDBC_PASSWORD;
+		return DEFAULT_PASSWORD;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
index f8ec3baed0..178378eb81 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/connection/NullConnection2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -65,7 +65,7 @@ public class NullConnection2_0
 	}
 
 	public String getDefaultDriver() {
-		return DEFAULT_JDBC_DRIVER;
+		return DEFAULT_DRIVER;
 	}
 
 	// ********** URL **********
@@ -78,7 +78,7 @@ public class NullConnection2_0
 	}
 
 	public String getDefaultUrl() {
-		return DEFAULT_JDBC_URL;
+		return DEFAULT_URL;
 	}
 
 	// ********** User **********
@@ -91,7 +91,7 @@ public class NullConnection2_0
 	}
 
 	public String getDefaultUser() {
-		return DEFAULT_JDBC_USER;
+		return DEFAULT_USER;
 	}
 
 	// ********** Password **********
@@ -104,6 +104,6 @@ public class NullConnection2_0
 	}
 
 	public String getDefaultPassword() {
-		return DEFAULT_JDBC_PASSWORD;
+		return DEFAULT_PASSWORD;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/Cacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/Cacheable2_0.java
index 8b7a93c551..4f2864b55f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/Cacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/Cacheable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.jpa2.context;
 import org.eclipse.jpt.jpa.core.context.JpaContextModel;
 
 /**
- * cacheable
+ * Cacheable
  * <p>
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -27,11 +27,10 @@ public interface Cacheable2_0
 	extends JpaContextModel
 {
 	boolean isCacheable();
-	
+		String CACHEABLE_PROPERTY = "cacheable"; //$NON-NLS-1$
 	Boolean getSpecifiedCacheable();
 	void setSpecifiedCacheable(Boolean cacheable);
 		String SPECIFIED_CACHEABLE_PROPERTY = "specifiedCacheable"; //$NON-NLS-1$
-	
-	boolean isDefaultCacheable();
+	boolean getDefaultCacheable();
 		String DEFAULT_CACHEABLE_PROPERTY = "defaultCacheable"; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OrphanRemovable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OrphanRemovable2_0.java
index 0b6f44ff2f..d35236a07f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OrphanRemovable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OrphanRemovable2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -32,7 +32,7 @@ public interface OrphanRemovable2_0
 	void setSpecifiedOrphanRemoval(Boolean orphanRemoval);
 		String SPECIFIED_ORPHAN_REMOVAL_PROPERTY = "specifiedOrphanRemoval"; //$NON-NLS-1$
 
-	boolean isDefaultOrphanRemoval();
+	boolean getDefaultOrphanRemoval();
 		String DEFAULT_ORPHAN_REMOVAL_PROPERTY = "defaultOrphanRemoval"; //$NON-NLS-1$
 		boolean DEFAULT_ORPHAN_REMOVAL = false;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedOrderColumn2_0.java
index 115b6955cc..8c0b5db939 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedOrderColumn2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -36,7 +36,7 @@ public interface SpecifiedOrderColumn2_0
 	Boolean getSpecifiedNullable();
 	void setSpecifiedNullable(Boolean newSpecifiedNullable);
 		String SPECIFIED_NULLABLE_PROPERTY = "specifiedNullable"; //$NON-NLS-1$
-	boolean isDefaultNullable();
+	boolean getDefaultNullable();
 		String DEFAULT_NULLABLE_PROPERTY = "defaultNullable"; //$NON-NLS-1$
 		boolean DEFAULT_NULLABLE = true;
 
@@ -51,7 +51,7 @@ public interface SpecifiedOrderColumn2_0
 	Boolean getSpecifiedInsertable();
 	void setSpecifiedInsertable(Boolean newSpecifiedInsertable);
 		String SPECIFIED_INSERTABLE_PROPERTY = "specifiedInsertable"; //$NON-NLS-1$
-	boolean isDefaultInsertable();
+	boolean getDefaultInsertable();
 		String DEFAULT_INSERTABLE_PROPERTY = "defaultInsertable"; //$NON-NLS-1$
 		boolean DEFAULT_INSERTABLE = true;
 	
@@ -66,7 +66,7 @@ public interface SpecifiedOrderColumn2_0
 	Boolean getSpecifiedUpdatable();
 	void setSpecifiedUpdatable(Boolean newSpecifiedUpdatable);
 		String SPECIFIED_UPDATABLE_PROPERTY = "specifiedUpdatable"; //$NON-NLS-1$
-	boolean isDefaultUpdatable();
+	boolean getDefaultUpdatable();
 		String DEFAULT_UPDATABLE_PROPERTY = "defaultUpdatable"; //$NON-NLS-1$
 		boolean DEFAULT_UPDATABLE = true;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/connection/Connection2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/connection/Connection2_0.java
index 77e1b17cd6..f403679814 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/connection/Connection2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/connection/Connection2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -23,37 +23,36 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
  */
 public interface Connection2_0
 	extends PersistenceUnitProperties
-{		
-	String getDefaultDriver();
+{
 	String getDriver();
 	void setDriver(String newDriver);
-		static final String DRIVER_PROPERTY = "driver"; //$NON-NLS-1$
+		String DRIVER_PROPERTY = "driver"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_JDBC_DRIVER = "javax.persistence.jdbc.driver"; //$NON-NLS-1$
-		static final String DEFAULT_JDBC_DRIVER = ""; //$NON-NLS-1$
+		String PERSISTENCE_JDBC_DRIVER = "javax.persistence.jdbc.driver"; //$NON-NLS-1$
+	String getDefaultDriver();
+		String DEFAULT_DRIVER = ""; //$NON-NLS-1$
 		
-	String getDefaultUrl();
 	String getUrl();
 	void setUrl(String newUrl);
-		static final String URL_PROPERTY = "url"; //$NON-NLS-1$
+		String URL_PROPERTY = "url"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_JDBC_URL = "javax.persistence.jdbc.url"; //$NON-NLS-1$
-		static final String DEFAULT_JDBC_URL = ""; //$NON-NLS-1$
+		String PERSISTENCE_JDBC_URL = "javax.persistence.jdbc.url"; //$NON-NLS-1$
+	String getDefaultUrl();
+		String DEFAULT_URL = ""; //$NON-NLS-1$
 		
-	String getDefaultUser();
 	String getUser();
 	void setUser(String newUser);
-		static final String USER_PROPERTY = "user"; //$NON-NLS-1$
+		String USER_PROPERTY = "user"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_JDBC_USER = "javax.persistence.jdbc.user"; //$NON-NLS-1$
-		static final String DEFAULT_JDBC_USER = ""; //$NON-NLS-1$
+		String PERSISTENCE_JDBC_USER = "javax.persistence.jdbc.user"; //$NON-NLS-1$
+	String getDefaultUser();
+		String DEFAULT_USER = ""; //$NON-NLS-1$
 		
-	String getDefaultPassword();
 	String getPassword();
 	void setPassword(String newPassword);
-		static final String PASSWORD_PROPERTY = "password"; //$NON-NLS-1$
+		String PASSWORD_PROPERTY = "password"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_JDBC_PASSWORD = "javax.persistence.jdbc.password"; //$NON-NLS-1$
-		static final String DEFAULT_JDBC_PASSWORD = ""; //$NON-NLS-1$
-	
+		String PERSISTENCE_JDBC_PASSWORD = "javax.persistence.jdbc.password"; //$NON-NLS-1$
+	String getDefaultPassword();
+		String DEFAULT_PASSWORD = ""; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/Options2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/Options2_0.java
index cf6219bf23..df4b8a1ceb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/Options2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/Options2_0.java
@@ -9,9 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.core.jpa2.context.persistence.options;
 
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -29,69 +27,51 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface Options2_0
 	extends PersistenceUnitProperties
 {
-	Integer getDefaultLockTimeout();
-	Transformer<Options2_0, Integer> DEFAULT_LOCK_TIMEOUT_TRANSFORMER = new DefaultLockTimeoutTransformer();
-	class DefaultLockTimeoutTransformer
-		extends TransformerAdapter<Options2_0, Integer>
-	{
-		@Override
-		public Integer transform(Options2_0 options) {
-			return options.getDefaultLockTimeout();
-		}
-	}
-
 	Integer getLockTimeout();
 	void setLockTimeout(Integer newLockTimeout);
-		static final String LOCK_TIMEOUT_PROPERTY = "lockTimeout"; //$NON-NLS-1$
+		String LOCK_TIMEOUT_PROPERTY = "lockTimeout"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_LOCK_TIMEOUT = "javax.persistence.lock.timeout"; //$NON-NLS-1$
-		static final Integer DEFAULT_LOCK_TIMEOUT = Integer.valueOf(5);
+		String PERSISTENCE_LOCK_TIMEOUT = "javax.persistence.lock.timeout"; //$NON-NLS-1$
 
-	Integer getDefaultQueryTimeout();
-	Transformer<Options2_0, Integer> DEFAULT_QUERY_TIMEOUT_TRANSFORMER = new DefaultQueryTimeoutTransformer();
-	class DefaultQueryTimeoutTransformer
-		extends TransformerAdapter<Options2_0, Integer>
-	{
-		@Override
-		public Integer transform(Options2_0 options) {
-			return options.getDefaultQueryTimeout();
-		}
-	}
+	Integer getDefaultLockTimeout();
+		Integer DEFAULT_LOCK_TIMEOUT = Integer.valueOf(5);
 
 	Integer getQueryTimeout();
 	void setQueryTimeout(Integer newQueryTimeout);
-		static final String QUERY_TIMEOUT_PROPERTY = "queryTimeout"; //$NON-NLS-1$
+		String QUERY_TIMEOUT_PROPERTY = "queryTimeout"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_QUERY_TIMEOUT = "javax.persistence.query.timeout"; //$NON-NLS-1$
-		static final Integer DEFAULT_QUERY_TIMEOUT = Integer.valueOf(5);
+		String PERSISTENCE_QUERY_TIMEOUT = "javax.persistence.query.timeout"; //$NON-NLS-1$
+
+	Integer getDefaultQueryTimeout();
+		Integer DEFAULT_QUERY_TIMEOUT = Integer.valueOf(5);
 
 	ListIterable<String> getValidationGroupPrePersists();
 	int getValidationGroupPrePersistsSize();
 	boolean validationGroupPrePersistExists(String validationGroupPrePersistClassName);
 	String addValidationGroupPrePersist(String newValidationGroupPrePersistClassName);
 	void removeValidationGroupPrePersist(String validationGroupPrePersistClassName);
-		static final String VALIDATION_GROUP_PRE_PERSIST_LIST = "validationGroupPrePersists"; //$NON-NLS-1$
-		static final String VALIDATION_GROUP_PRE_PERSIST_PROPERTY = "validationGroupPrePersist"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_PERSIST_LIST = "validationGroupPrePersists"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_PERSIST_PROPERTY = "validationGroupPrePersist"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST = "javax.persistence.validation.group.pre-persist"; //$NON-NLS-1$
+		String PERSISTENCE_VALIDATION_GROUP_PRE_PERSIST = "javax.persistence.validation.group.pre-persist"; //$NON-NLS-1$
 
 	ListIterable<String> getValidationGroupPreUpdates();
 	int getValidationGroupPreUpdatesSize();
 	boolean validationGroupPreUpdateExists(String validationGroupPreUpdateClassName);
 	String addValidationGroupPreUpdate(String newValidationGroupPreUpdateClassName);
 	void removeValidationGroupPreUpdate(String validationGroupPreUpdateClassName);
-		static final String VALIDATION_GROUP_PRE_UPDATE_LIST = "validationGroupPreUpdates"; //$NON-NLS-1$
-		static final String VALIDATION_GROUP_PRE_UPDATE_PROPERTY = "validationGroupPreUpdate"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_UPDATE_LIST = "validationGroupPreUpdates"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_UPDATE_PROPERTY = "validationGroupPreUpdate"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE = "javax.persistence.validation.group.pre-update"; //$NON-NLS-1$
+		String PERSISTENCE_VALIDATION_GROUP_PRE_UPDATE = "javax.persistence.validation.group.pre-update"; //$NON-NLS-1$
 
 	ListIterable<String> getValidationGroupPreRemoves();
 	int getValidationGroupPreRemovesSize();
 	boolean validationGroupPreRemoveExists(String validationGroupPreRemoveClassName);
 	String addValidationGroupPreRemove(String newValidationGroupPreRemoveClassName);
 	void removeValidationGroupPreRemove(String validationGroupPreRemoveClassName);
-		static final String VALIDATION_GROUP_PRE_REMOVE_LIST = "validationGroupPreRemoves"; //$NON-NLS-1$
-		static final String VALIDATION_GROUP_PRE_REMOVE_PROPERTY = "validationGroupPreRemove"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_REMOVE_LIST = "validationGroupPreRemoves"; //$NON-NLS-1$
+		String VALIDATION_GROUP_PRE_REMOVE_PROPERTY = "validationGroupPreRemove"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE = "javax.persistence.validation.group.pre-remove"; //$NON-NLS-1$
+		String PERSISTENCE_VALIDATION_GROUP_PRE_REMOVE = "javax.persistence.validation.group.pre-remove"; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/persistence/schemagen/SchemaGeneration2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/persistence/schemagen/SchemaGeneration2_1.java
index 01dc92823a..8ba41eeb99 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/persistence/schemagen/SchemaGeneration2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2_1/context/persistence/schemagen/SchemaGeneration2_1.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 Oracle. All rights reserved.
+ * Copyright (c) 2013, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,117 +20,117 @@ public interface SchemaGeneration2_1
 	extends PersistenceUnitProperties
 {
 	// Schema Generation 
-	SchemaGenerationAction2_1 getDefaultSchemaGenDatabaseAction();
 	SchemaGenerationAction2_1 getSchemaGenDatabaseAction();
 	void setSchemaGenDatabaseAction(SchemaGenerationAction2_1 newSchemaGenAction);
-		static final String SCHEMAGEN_DATABASE_ACTION_PROPERTY = "schemaGenDatabaseAction"; //$NON-NLS-1$
+		String SCHEMAGEN_DATABASE_ACTION_PROPERTY = "schemaGenDatabaseAction"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCHEMAGEN_DATABASE_ACTION = "javax.persistence.schema-generation.database.action"; //$NON-NLS-1$
-		static final SchemaGenerationAction2_1 DEFAULT_SCHEMAGEN_DATABASE_ACTION = SchemaGenerationAction2_1.none;
+		String PERSISTENCE_SCHEMAGEN_DATABASE_ACTION = "javax.persistence.schema-generation.database.action"; //$NON-NLS-1$
+	SchemaGenerationAction2_1 getDefaultSchemaGenDatabaseAction();
+		SchemaGenerationAction2_1 DEFAULT_SCHEMAGEN_DATABASE_ACTION = SchemaGenerationAction2_1.none;
 
-	SchemaGenerationAction2_1 getDefaultSchemaGenScriptsAction();
 	SchemaGenerationAction2_1 getSchemaGenScriptsAction();
 	void setSchemaGenScriptsAction(SchemaGenerationAction2_1 newSchemaGenAction);
-		static final String SCHEMAGEN_SCRIPTS_ACTION_PROPERTY = "schemaGenScriptsAction"; //$NON-NLS-1$
+		String SCHEMAGEN_SCRIPTS_ACTION_PROPERTY = "schemaGenScriptsAction"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCHEMAGEN_SCRIPTS_ACTION = "javax.persistence.schema-generation.scripts.action"; //$NON-NLS-1$
-		static final SchemaGenerationAction2_1 DEFAULT_SCHEMAGEN_SCRIPTS_ACTION = SchemaGenerationAction2_1.none;
+		String PERSISTENCE_SCHEMAGEN_SCRIPTS_ACTION = "javax.persistence.schema-generation.scripts.action"; //$NON-NLS-1$
+	SchemaGenerationAction2_1 getDefaultSchemaGenScriptsAction();
+		SchemaGenerationAction2_1 DEFAULT_SCHEMAGEN_SCRIPTS_ACTION = SchemaGenerationAction2_1.none;
 
-	SchemaGenerationTarget2_1 getDefaultSchemaGenCreateSource();
 	SchemaGenerationTarget2_1 getSchemaGenCreateSource();
 	void setSchemaGenCreateSource(SchemaGenerationTarget2_1 newSchemaGenSource);
-		static final String SCHEMAGEN_CREATE_SOURCE_PROPERTY = "schemaGenCreateSource"; //$NON-NLS-1$
+		String SCHEMAGEN_CREATE_SOURCE_PROPERTY = "schemaGenCreateSource"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCHEMAGEN_CREATE_SOURCE = "javax.persistence.schema-generation.create-source"; //$NON-NLS-1$
-		static final SchemaGenerationTarget2_1 DEFAULT_SCHEMAGEN_CREATE_SOURCE = null;
+		String PERSISTENCE_SCHEMAGEN_CREATE_SOURCE = "javax.persistence.schema-generation.create-source"; //$NON-NLS-1$
+	SchemaGenerationTarget2_1 getDefaultSchemaGenCreateSource();
+		SchemaGenerationTarget2_1 DEFAULT_SCHEMAGEN_CREATE_SOURCE = null;
 
-	SchemaGenerationTarget2_1 getDefaultSchemaGenDropSource();
 	SchemaGenerationTarget2_1 getSchemaGenDropSource();
 	void setSchemaGenDropSource(SchemaGenerationTarget2_1 newSchemaGenSource);
-		static final String SCHEMAGEN_DROP_SOURCE_PROPERTY = "schemaGenDropSource"; //$NON-NLS-1$
+		String SCHEMAGEN_DROP_SOURCE_PROPERTY = "schemaGenDropSource"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCHEMAGEN_DROP_SOURCE = "javax.persistence.schema-generation.drop-source"; //$NON-NLS-1$
-		static final SchemaGenerationTarget2_1 DEFAULT_SCHEMAGEN_DROP_SOURCE = null;
+		String PERSISTENCE_SCHEMAGEN_DROP_SOURCE = "javax.persistence.schema-generation.drop-source"; //$NON-NLS-1$
+	SchemaGenerationTarget2_1 getDefaultSchemaGenDropSource();
+		SchemaGenerationTarget2_1 DEFAULT_SCHEMAGEN_DROP_SOURCE = null;
 
-	Boolean getDefaultCreateDatabaseSchemas();
 	Boolean getCreateDatabaseSchemas();
 	void setCreateDatabaseSchemas(Boolean newCreateDatabaseSchemas);
-		static final String CREATE_DATABASE_SCHEMAS_PROPERTY = "createDatabaseSchemas"; //$NON-NLS-1$
+		String CREATE_DATABASE_SCHEMAS_PROPERTY = "createDatabaseSchemas"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_CREATE_DATABASE_SCHEMAS = "javax.persistence.schema-generation.create-database-schemas"; //$NON-NLS-1$
-		static final Boolean DEFAULT_CREATE_DATABASE_SCHEMAS = Boolean.FALSE;
+		String PERSISTENCE_CREATE_DATABASE_SCHEMAS = "javax.persistence.schema-generation.create-database-schemas"; //$NON-NLS-1$
+	Boolean getDefaultCreateDatabaseSchemas();
+		String DEFAULT_CREATE_DATABASE_SCHEMAS_PROPERTY = "defaultCreateDatabaseSchemas"; //$NON-NLS-1$
+		Boolean DEFAULT_CREATE_DATABASE_SCHEMAS = Boolean.FALSE;
 
-	String getDefaultScriptsCreateTarget();
 	String getScriptsCreateTarget();
 	void setScriptsCreateTarget(String newScriptsCreateTarget);
-		static final String SCRIPTS_CREATE_TARGET_PROPERTY = "scriptsCreateTarget"; //$NON-NLS-1$
+		String SCRIPTS_CREATE_TARGET_PROPERTY = "scriptsCreateTarget"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCRIPTS_CREATE_TARGET = "javax.persistence.schema-generation.scripts.create-target"; //$NON-NLS-1$
-		static final String DEFAULT_SCRIPTS_CREATE_TARGET = ""; //$NON-NLS-1$
+		String PERSISTENCE_SCRIPTS_CREATE_TARGET = "javax.persistence.schema-generation.scripts.create-target"; //$NON-NLS-1$
+	String getDefaultScriptsCreateTarget();
+		String DEFAULT_SCRIPTS_CREATE_TARGET = ""; //$NON-NLS-1$
 
-	String getDefaultScriptsDropTarget();
 	String getScriptsDropTarget();
 	void setScriptsDropTarget(String newScriptsDropTarget);
-		static final String SCRIPTS_DROP_TARGET_PROPERTY = "scriptsDropTarget"; //$NON-NLS-1$
+		String SCRIPTS_DROP_TARGET_PROPERTY = "scriptsDropTarget"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_SCRIPTS_DROP_TARGET = "javax.persistence.schema-generation.scripts.drop-target"; //$NON-NLS-1$
-		static final String DEFAULT_SCRIPTS_DROP_TARGET = ""; //$NON-NLS-1$
+		String PERSISTENCE_SCRIPTS_DROP_TARGET = "javax.persistence.schema-generation.scripts.drop-target"; //$NON-NLS-1$
+	String getDefaultScriptsDropTarget();
+		String DEFAULT_SCRIPTS_DROP_TARGET = ""; //$NON-NLS-1$
 
-	String getDefaultDatabaseProductName();
 	String getDatabaseProductName();
 	void setDatabaseProductName(String newDatabaseProductName);
-		static final String DATABASE_PRODUCT_NAME_PROPERTY = "databaseProductName"; //$NON-NLS-1$
+		String DATABASE_PRODUCT_NAME_PROPERTY = "databaseProductName"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_DATABASE_PRODUCT_NAME = "javax.persistence.database-product-name"; //$NON-NLS-1$
-		static final String DEFAULT_DATABASE_PRODUCT_NAME = ""; //$NON-NLS-1$
+		String PERSISTENCE_DATABASE_PRODUCT_NAME = "javax.persistence.database-product-name"; //$NON-NLS-1$
+	String getDefaultDatabaseProductName();
+		String DEFAULT_DATABASE_PRODUCT_NAME = ""; //$NON-NLS-1$
 
-	String getDefaultDatabaseMajorVersion();
 	String getDatabaseMajorVersion();
 	void setDatabaseMajorVersion(String newDatabaseMajorVersion);
-		static final String DATABASE_MAJOR_VERSION_PROPERTY = "databaseMajorVersion"; //$NON-NLS-1$
+		String DATABASE_MAJOR_VERSION_PROPERTY = "databaseMajorVersion"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_DATABASE_MAJOR_VERSION = "javax.persistence.database-major-version"; //$NON-NLS-1$
-		static final String DEFAULT_DATABASE_MAJOR_VERSION = ""; //$NON-NLS-1$
+		String PERSISTENCE_DATABASE_MAJOR_VERSION = "javax.persistence.database-major-version"; //$NON-NLS-1$
+	String getDefaultDatabaseMajorVersion();
+		String DEFAULT_DATABASE_MAJOR_VERSION = ""; //$NON-NLS-1$
 
-	String getDefaultDatabaseMinorVersion();
 	String getDatabaseMinorVersion();
 	void setDatabaseMinorVersion(String newDatabaseMinorVersion);
-		static final String DATABASE_MINOR_VERSION_PROPERTY = "databaseMinorVersion"; //$NON-NLS-1$
+		String DATABASE_MINOR_VERSION_PROPERTY = "databaseMinorVersion"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_DATABASE_MINOR_VERSION = "javax.persistence.database-minor-version"; //$NON-NLS-1$
-		static final String DEFAULT_DATABASE_MINOR_VERSION = ""; //$NON-NLS-1$
+		String PERSISTENCE_DATABASE_MINOR_VERSION = "javax.persistence.database-minor-version"; //$NON-NLS-1$
+	String getDefaultDatabaseMinorVersion();
+		String DEFAULT_DATABASE_MINOR_VERSION = ""; //$NON-NLS-1$
 
-	String getDefaultCreateScriptSource();
 	String getCreateScriptSource();
 	void setCreateScriptSource(String newCreateScriptSource);
-		static final String CREATE_SCRIPT_SOURCE_PROPERTY = "createScriptSource"; //$NON-NLS-1$
+		String CREATE_SCRIPT_SOURCE_PROPERTY = "createScriptSource"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_CREATE_SCRIPT_SOURCE = "javax.persistence.schema-generation.create-script-source"; //$NON-NLS-1$
-		static final String DEFAULT_CREATE_SCRIPT_SOURCE = ""; //$NON-NLS-1$
+		String PERSISTENCE_CREATE_SCRIPT_SOURCE = "javax.persistence.schema-generation.create-script-source"; //$NON-NLS-1$
+	String getDefaultCreateScriptSource();
+		String DEFAULT_CREATE_SCRIPT_SOURCE = ""; //$NON-NLS-1$
 
-	String getDefaultDropScriptSource();
 	String getDropScriptSource();
 	void setDropScriptSource(String newDropScriptSource);
-		static final String DROP_SCRIPT_SOURCE_PROPERTY = "dropScriptSource"; //$NON-NLS-1$
+		String DROP_SCRIPT_SOURCE_PROPERTY = "dropScriptSource"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_DROP_SCRIPT_SOURCE = "javax.persistence.schema-generation.drop-script-source"; //$NON-NLS-1$
-		static final String DEFAULT_DROP_SCRIPT_SOURCE = ""; //$NON-NLS-1$
+		String PERSISTENCE_DROP_SCRIPT_SOURCE = "javax.persistence.schema-generation.drop-script-source"; //$NON-NLS-1$
+	String getDefaultDropScriptSource();
+		String DEFAULT_DROP_SCRIPT_SOURCE = ""; //$NON-NLS-1$
 
-	String getDefaultConnection();
 	String getConnection();
 	void setConnection(String newConnection);
-		static final String CONNECTION_PROPERTY = "connection"; //$NON-NLS-1$
+		String CONNECTION_PROPERTY = "connection"; //$NON-NLS-1$
 		// Property key string
-		static final String PERSISTENCE_CONNECTION = "javax.persistence.schema-generation.connection"; //$NON-NLS-1$
-		static final String DEFAULT_CONNECTION = ""; //$NON-NLS-1$
+		String PERSISTENCE_CONNECTION = "javax.persistence.schema-generation.connection"; //$NON-NLS-1$
+	String getDefaultConnection();
+		String DEFAULT_CONNECTION = ""; //$NON-NLS-1$
 
 	// Data Loading 
-	String getDefaultSqlLoadScriptSource();
 	String getSqlLoadScriptSource();
 	void setSqlLoadScriptSource(String newSqlLoadScriptSource);
-		static final String SQL_LOAD_SCRIPT_SOURCE_PROPERTY = "sqlLoadScriptSource"; //$NON-NLS-1$
+		String SQL_LOAD_SCRIPT_SOURCE_PROPERTY = "sqlLoadScriptSource"; //$NON-NLS-1$
 		// Property key
-		static final String PERSISTENCE_SQL_LOAD_SCRIPT_SOURCE = "javax.persistence.sql-load-script-source"; //$NON-NLS-1$
-		static final String DEFAULT_SQL_LOAD_SCRIPT_SOURCE = ""; //$NON-NLS-1$
-
+		String PERSISTENCE_SQL_LOAD_SCRIPT_SOURCE = "javax.persistence.sql-load-script-source"; //$NON-NLS-1$
+	String getDefaultSqlLoadScriptSource();
+		String DEFAULT_SQL_LOAD_SCRIPT_SOURCE = ""; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java
index a4d642e47f..e81f5b0ad3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkCaching.java
@@ -9,14 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.int_.IntTransformerAdapter;
 import org.eclipse.jpt.common.utility.predicate.Predicate;
-import org.eclipse.jpt.common.utility.transformer.IntTransformer;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.JpaContextModel;
 
 /**
@@ -43,41 +37,12 @@ public interface EclipseLinkCaching
 	 */
 	EclipseLinkCacheType getType();
 		String TYPE_PROPERTY = "type"; //$NON-NLS-1$
-	
 	EclipseLinkCacheType getSpecifiedType();	
 	void setSpecifiedType(EclipseLinkCacheType type);
 		String SPECIFIED_TYPE_PROPERTY = "specifiedType"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, EclipseLinkCacheType> SPECIFIED_TYPE_TRANSFORMER = new SpecifiedTypeTransformer();
-		class SpecifiedTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-		{
-			@Override
-			public EclipseLinkCacheType transform(EclipseLinkCaching model) {
-				return model.getSpecifiedType();
-			}
-		}
-		BiClosure<EclipseLinkCaching, EclipseLinkCacheType> SET_SPECIFIED_TYPE_CLOSURE = new SetSpecifiedTypeClosure();
-		class SetSpecifiedTypeClosure
-			extends BiClosureAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, EclipseLinkCacheType type) {
-				model.setSpecifiedType(type);
-			}
-		}
-
 	EclipseLinkCacheType getDefaultType();		
 		String DEFAULT_TYPE_PROPERTY = "defaultType"; //$NON-NLS-1$
 		EclipseLinkCacheType DEFAULT_TYPE = EclipseLinkCacheType.SOFT_WEAK;
-		Transformer<EclipseLinkCaching, EclipseLinkCacheType> DEFAULT_TYPE_TRANSFORMER = new DefaultTypeTransformer();
-		class DefaultTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-		{
-			@Override
-			public EclipseLinkCacheType transform(EclipseLinkCaching model) {
-				return model.getDefaultType();
-			}
-		}
 		
 	
 	// ********** size **********
@@ -88,41 +53,12 @@ public interface EclipseLinkCaching
 	 */
 	int getSize();
 		String SIZE_PROPERTY = "size"; //$NON-NLS-1$
-
 	Integer getSpecifiedSize();
 	void setSpecifiedSize(Integer size);
 		String SPECIFIED_SIZE_PROPERTY = "specifiedSize"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Integer> SPECIFIED_SIZE_TRANSFORMER = new SpecifiedSizeTransformer();
-		class SpecifiedSizeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Integer>
-		{
-			@Override
-			public Integer transform(EclipseLinkCaching model) {
-				return model.getSpecifiedSize();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Integer> SET_SPECIFIED_SIZE_CLOSURE = new SetSpecifiedSizeClosure();
-		class SetSpecifiedSizeClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Integer>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Integer size) {
-				model.setSpecifiedSize(size);
-			}
-		}
-	
 	int getDefaultSize();
 		String DEFAULT_SIZE_PROPERTY = "defaultSize"; //$NON-NLS-1$
 		int DEFAULT_SIZE = 100;
-		IntTransformer<EclipseLinkCaching> DEFAULT_SIZE_TRANSFORMER = new DefaultSizeTransformer();
-		class DefaultSizeTransformer
-			extends IntTransformerAdapter<EclipseLinkCaching>
-		{
-			@Override
-			public int transform(EclipseLinkCaching model) {
-				return model.getDefaultSize();
-			}
-		}
 
 
 	// ********** shared **********
@@ -142,9 +78,7 @@ public interface EclipseLinkCaching
 				return model.isShared();
 			}
 		}
-	
 	Boolean getSpecifiedShared();
-
 	/**
 	 * Specifying <em>shared</em> <code>false</code> will return the following
 	 * caching settings to their defaults:<ul>
@@ -163,37 +97,9 @@ public interface EclipseLinkCaching
 	 */
 	void setSpecifiedShared(Boolean shared);
 		String SPECIFIED_SHARED_PROPERTY = "specifiedShared"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Boolean> SPECIFIED_SHARED_TRANSFORMER = new SpecifiedSharedTransformer();
-		class SpecifiedSharedTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching model) {
-				return model.getSpecifiedShared();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Boolean> SET_SPECIFIED_SHARED_CLOSURE = new SetSpecifiedSharedClosure();
-		class SetSpecifiedSharedClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Boolean value) {
-				model.setSpecifiedShared(value);
-			}
-		}
-
 	boolean getDefaultShared();
 		String DEFAULT_SHARED_PROPERTY = "defaultShared"; //$NON-NLS-1$
 		boolean DEFAULT_SHARED = true;
-		Predicate<EclipseLinkCaching> DEFAULT_SHARED_PREDICATE = new DefaultSharedPredicate();
-		class DefaultSharedPredicate
-			extends PredicateAdapter<EclipseLinkCaching>
-		{
-			@Override
-			public boolean evaluate(EclipseLinkCaching caching) {
-				return caching.getDefaultShared();
-			}
-		}
 	
 	
 	// ********** always refresh **********
@@ -204,41 +110,12 @@ public interface EclipseLinkCaching
 	 */
 	boolean isAlwaysRefresh();
 		String ALWAYS_REFRESH_PROPERTY = "alwaysRefresh"; //$NON-NLS-1$
-	
 	Boolean getSpecifiedAlwaysRefresh();
 	void setSpecifiedAlwaysRefresh(Boolean alwaysRefresh);
 		String SPECIFIED_ALWAYS_REFRESH_PROPERTY = "specifiedAlwaysRefresh"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Boolean> SPECIFIED_ALWAYS_REFRESH_TRANSFORMER = new SpecifiedAlwaysRefreshTransformer();
-		class SpecifiedAlwaysRefreshTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching model) {
-				return model.getSpecifiedAlwaysRefresh();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Boolean> SET_SPECIFIED_ALWAYS_REFRESH_CLOSURE = new SetSpecifiedAlwaysRefreshClosure();
-		class SetSpecifiedAlwaysRefreshClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Boolean value) {
-				model.setSpecifiedAlwaysRefresh(value);
-			}
-		}
-
 	boolean getDefaultAlwaysRefresh();
 		String DEFAULT_ALWAYS_REFRESH_PROPERTY = "defaultAlwaysRefresh"; //$NON-NLS-1$
 		boolean DEFAULT_ALWAYS_REFRESH = false;
-		Predicate<EclipseLinkCaching> DEFAULT_ALWAYS_REFRESH_TRANSFORMER = new DefaultAlwaysRefreshPredicate();
-		class DefaultAlwaysRefreshPredicate
-			extends PredicateAdapter<EclipseLinkCaching>
-		{
-			@Override
-			public boolean evaluate(EclipseLinkCaching variable) {
-				return variable.getDefaultAlwaysRefresh();
-			}
-		}
 	
 
 	// ********** refresh only if newer **********
@@ -249,41 +126,12 @@ public interface EclipseLinkCaching
 	 */
 	boolean isRefreshOnlyIfNewer();
 		String REFRESH_ONLY_IF_NEWER_PROPERTY = "refreshOnlyIfNewer"; //$NON-NLS-1$
-	
 	Boolean getSpecifiedRefreshOnlyIfNewer();
 	void setSpecifiedRefreshOnlyIfNewer(Boolean refreshOnlyIfNewer);
 		String SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY = "specifiedRefreshOnlyIfNewer"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Boolean> SPECIFIED_REFRESH_ONLY_IF_NEWER_TRANSFORMER = new SpecifiedRefreshOnlyIfNewerTransformer();
-		class SpecifiedRefreshOnlyIfNewerTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching model) {
-				return model.getSpecifiedRefreshOnlyIfNewer();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Boolean> SET_SPECIFIED_REFRESH_ONLY_IF_NEWER_CLOSURE = new SetSpecifiedRefreshOnlyIfNewerClosure();
-		class SetSpecifiedRefreshOnlyIfNewerClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Boolean value) {
-				model.setSpecifiedRefreshOnlyIfNewer(value);
-			}
-		}
-
 	boolean getDefaultRefreshOnlyIfNewer();
 		String DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY = "defaultRefreshOnlyIfNewer"; //$NON-NLS-1$
 		boolean DEFAULT_REFRESH_ONLY_IF_NEWER = false;
-		Predicate<EclipseLinkCaching> DEFAULT_REFRESH_ONLY_IF_NEWER_TRANSFORMER = new DefaultRefreshOnlyIfNewerPredicate();
-		class DefaultRefreshOnlyIfNewerPredicate
-			extends PredicateAdapter<EclipseLinkCaching>
-		{
-			@Override
-			public boolean evaluate(EclipseLinkCaching variable) {
-				return variable.getDefaultRefreshOnlyIfNewer();
-			}
-		}
 	
 		
 	// ********** disable hits **********
@@ -294,41 +142,12 @@ public interface EclipseLinkCaching
 	 */
 	boolean isDisableHits();
 		String DISABLE_HITS_PROPERTY = "disableHits"; //$NON-NLS-1$
-	
 	Boolean getSpecifiedDisableHits();
 	void setSpecifiedDisableHits(Boolean disableHits);
 		String SPECIFIED_DISABLE_HITS_PROPERTY = "specifiedDisableHits"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Boolean> SPECIFIED_DISABLE_HITS_TRANSFORMER = new SpecifiedDisableHitsTransformer();
-		class SpecifiedDisableHitsTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching model) {
-				return model.getSpecifiedDisableHits();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Boolean> SET_SPECIFIED_DISABLE_HITS_CLOSURE = new SetSpecifiedDisableHitsClosure();
-		class SetSpecifiedDisableHitsClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Boolean value) {
-				model.setSpecifiedDisableHits(value);
-			}
-		}
-
 	boolean getDefaultDisableHits();
 		String DEFAULT_DISABLE_HITS_PROPERTY = "defaultDisableHits"; //$NON-NLS-1$
 		boolean DEFAULT_DISABLE_HITS = false;
-		Predicate<EclipseLinkCaching> DEFAULT_DISABLE_HITS_TRANSFORMER = new DefaultDisableHitsPredicate();
-		class DefaultDisableHitsPredicate
-			extends PredicateAdapter<EclipseLinkCaching>
-		{
-			@Override
-			public boolean evaluate(EclipseLinkCaching variable) {
-				return variable.getDefaultDisableHits();
-			}
-		}
 	
 
 		
@@ -340,41 +159,12 @@ public interface EclipseLinkCaching
 	 */
 	EclipseLinkCacheCoordinationType getCoordinationType();
 		String COORDINATION_TYPE_PROPERTY = "coordinationType"; //$NON-NLS-1$
-	
 	EclipseLinkCacheCoordinationType getSpecifiedCoordinationType();	
 	void setSpecifiedCoordinationType(EclipseLinkCacheCoordinationType coordinationType);
 		String SPECIFIED_COORDINATION_TYPE_PROPERTY = "specifiedCoordinationType"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, EclipseLinkCacheCoordinationType> SPECIFIED_COORDINATION_TYPE_TRANSFORMER = new SpecifiedCoordinationTypeTransformer();
-		class SpecifiedCoordinationTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheCoordinationType>
-		{
-			@Override
-			public EclipseLinkCacheCoordinationType transform(EclipseLinkCaching model) {
-				return model.getSpecifiedCoordinationType();
-			}
-		}
-		BiClosure<EclipseLinkCaching, EclipseLinkCacheCoordinationType> SET_SPECIFIED_COORDINATION_TYPE_CLOSURE = new SetSpecifiedCoordinationTypeClosure();
-		class SetSpecifiedCoordinationTypeClosure
-			extends BiClosureAdapter<EclipseLinkCaching, EclipseLinkCacheCoordinationType>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, EclipseLinkCacheCoordinationType type) {
-				model.setSpecifiedCoordinationType(type);
-			}
-		}
-
 	EclipseLinkCacheCoordinationType getDefaultCoordinationType();		
 		String DEFAULT_COORDINATION_TYPE_PROPERTY = "defaultCoordinationType"; //$NON-NLS-1$
 		EclipseLinkCacheCoordinationType DEFAULT_COORDINATION_TYPE = EclipseLinkCacheCoordinationType.SEND_OBJECT_CHANGES;
-		Transformer<EclipseLinkCaching, EclipseLinkCacheCoordinationType> DEFAULT_COORDINATION_TYPE_TRANSFORMER = new DefaultCoordinationTypeTransformer();
-		class DefaultCoordinationTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheCoordinationType>
-		{
-			@Override
-			public EclipseLinkCacheCoordinationType transform(EclipseLinkCaching model) {
-				return model.getDefaultCoordinationType();
-			}
-		}
 
 		
 	// ********** expiry **********
@@ -385,32 +175,13 @@ public interface EclipseLinkCaching
 	 * It is not valid to specify both
 	 */
 	Integer getExpiry();
-	
 	/**
 	 * Setting this to a non-null value will set timeOfDayExpiry to null
 	 */
 	void setExpiry(Integer expiry);
 		String EXPIRY_PROPERTY = "expiry"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, Integer> EXPIRY_TRANSFORMER = new ExpiryTransformer();
-		class ExpiryTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Integer>
-		{
-			@Override
-			public Integer transform(EclipseLinkCaching model) {
-				return model.getExpiry();
-			}
-		}
-		BiClosure<EclipseLinkCaching, Integer> SET_EXPIRY_CLOSURE = new SetExpiryClosure();
-		class SetExpiryClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Integer>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, Integer expiry) {
-				model.setExpiry(expiry);
-			}
-		}
 
-		
+
 	// ********** expiry time of day **********
 
 	/**
@@ -441,41 +212,12 @@ public interface EclipseLinkCaching
 	 */
 	EclipseLinkExistenceType getExistenceType();
 		String EXISTENCE_TYPE_PROPERTY = "existenceType"; //$NON-NLS-1$
-	
 	EclipseLinkExistenceType getSpecifiedExistenceType();	
 	void setSpecifiedExistenceType(EclipseLinkExistenceType type);
 		String SPECIFIED_EXISTENCE_TYPE_PROPERTY = "specifiedExistenceType"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, EclipseLinkExistenceType> SPECIFIED_EXISTENCE_TYPE_TRANSFORMER = new SpecifiedExistenceTypeTransformer();
-		class SpecifiedExistenceTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkExistenceType>
-		{
-			@Override
-			public EclipseLinkExistenceType transform(EclipseLinkCaching model) {
-				return model.getSpecifiedExistenceType();
-			}
-		}
-		BiClosure<EclipseLinkCaching, EclipseLinkExistenceType> SET_SPECIFIED_EXISTENCE_TYPE_CLOSURE = new SetSpecifiedExistenceTypeClosure();
-		class SetSpecifiedExistenceTypeClosure
-			extends BiClosureAdapter<EclipseLinkCaching, EclipseLinkExistenceType>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, EclipseLinkExistenceType type) {
-				model.setSpecifiedExistenceType(type);
-			}
-		}
-
 	EclipseLinkExistenceType getDefaultExistenceType();		
 		String DEFAULT_EXISTENCE_TYPE_PROPERTY = "defaultExistenceType"; //$NON-NLS-1$
 		EclipseLinkExistenceType DEFAULT_EXISTENCE_TYPE = EclipseLinkExistenceType.CHECK_DATABASE;
-		Transformer<EclipseLinkCaching, EclipseLinkExistenceType> DEFAULT_EXISTENCE_TYPE_TRANSFORMER = new DefaultExistenceTypeTransformer();
-		class DefaultExistenceTypeTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkExistenceType>
-		{
-			@Override
-			public EclipseLinkExistenceType transform(EclipseLinkCaching model) {
-				return model.getDefaultExistenceType();
-			}
-		}
 
 
 	// ********** isolation added in EclipseLink 2.2 **********
@@ -486,39 +228,10 @@ public interface EclipseLinkCaching
 	 */
 	EclipseLinkCacheIsolationType2_2 getIsolation();
 		String ISOLATION_PROPERTY = "isolation"; //$NON-NLS-1$
-
 	EclipseLinkCacheIsolationType2_2 getSpecifiedIsolation();	
 	void setSpecifiedIsolation(EclipseLinkCacheIsolationType2_2 isolation);
 		String SPECIFIED_ISOLATION_PROPERTY = "specifiedIsolation"; //$NON-NLS-1$
-		Transformer<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2> SPECIFIED_ISOLATION_TRANSFORMER = new SpecifiedIsolationTransformer();
-		class SpecifiedIsolationTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2>
-		{
-			@Override
-			public EclipseLinkCacheIsolationType2_2 transform(EclipseLinkCaching model) {
-				return model.getSpecifiedIsolation();
-			}
-		}
-		BiClosure<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2> SET_SPECIFIED_ISOLATION_CLOSURE = new SetSpecifiedIsolationClosure();
-		class SetSpecifiedIsolationClosure
-			extends BiClosureAdapter<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2>
-		{
-			@Override
-			public void execute(EclipseLinkCaching model, EclipseLinkCacheIsolationType2_2 type) {
-				model.setSpecifiedIsolation(type);
-			}
-		}
-
 	EclipseLinkCacheIsolationType2_2 getDefaultIsolation();		
 		String DEFAULT_ISOLATION_PROPERTY = "defaultIsolation"; //$NON-NLS-1$
 		EclipseLinkCacheIsolationType2_2 DEFAULT_ISOLATION = EclipseLinkCacheIsolationType2_2.SHARED;
-		Transformer<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2> DEFAULT_ISOLATION_TRANSFORMER = new DefaultIsolationTransformer();
-		class DefaultIsolationTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheIsolationType2_2>
-		{
-			@Override
-			public EclipseLinkCacheIsolationType2_2 transform(EclipseLinkCaching model) {
-				return model.getDefaultIsolation();
-			}
-		}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMultitenancy2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMultitenancy2_3.java
index 14f11a0a8f..5018d41e88 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMultitenancy2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMultitenancy2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -27,13 +27,13 @@ import org.eclipse.jpt.jpa.core.context.JpaContextModel;
 public interface EclipseLinkMultitenancy2_3
 	extends JpaContextModel
 {
-
 	boolean isMultitenant();
-	boolean isDefaultMultitenant();
-		String DEFAULT_MULTITENANT_PROPERTY = "defaultMultitenant"; //$NON-NLS-1$
-	boolean isSpecifiedMultitenant();
-	void setSpecifiedMultitenant(boolean isMultitenant);
+		String MULTITENANT_PROPERTY = "multitenant"; //$NON-NLS-1$
+	boolean getSpecifiedMultitenant();
+	void setSpecifiedMultitenant(boolean multitenant);
 		String SPECIFIED_MULTITENANT_PROPERTY = "specifiedMultitenant"; //$NON-NLS-1$
+	boolean getDefaultMultitenant();
+		String DEFAULT_MULTITENANT_PROPERTY = "defaultMultitenant"; //$NON-NLS-1$
 
 	// ********** type **********
 
@@ -42,11 +42,10 @@ public interface EclipseLinkMultitenancy2_3
 	 * If getSpecifiedType() returns null, then return getDefaultType()
 	 */
 	EclipseLinkMultitenantType2_3 getType();
-
-	EclipseLinkMultitenantType2_3 getSpecifiedType();	
+		String TYPE_PROPERTY = "type"; //$NON-NLS-1$
+	EclipseLinkMultitenantType2_3 getSpecifiedType();
 	void setSpecifiedType(EclipseLinkMultitenantType2_3 type);
 		String SPECIFIED_TYPE_PROPERTY = "specifiedType"; //$NON-NLS-1$
-
 	EclipseLinkMultitenantType2_3 getDefaultType();		
 		String DEFAULT_TYPE_PROPERTY = "defaultType"; //$NON-NLS-1$
 		EclipseLinkMultitenantType2_3 DEFAULT_TYPE = EclipseLinkMultitenantType2_3.SINGLE_TABLE;
@@ -59,12 +58,12 @@ public interface EclipseLinkMultitenancy2_3
 	 * If getSpecifiedIncludeCriteria() returns null, then return isDefaultIncludeCriteria()
 	 */
 	boolean isIncludeCriteria();
+		String INCLUDE_CRITERIA_PROPERTY = "includeCriteria"; //$NON-NLS-1$
 
 	Boolean getSpecifiedIncludeCriteria();
 	void setSpecifiedIncludeCriteria(Boolean includeCriteria);
 		String SPECIFIED_INCLUDE_CRITERIA_PROPERTY = "specifiedIncludeCriteria"; //$NON-NLS-1$
-
-	boolean isDefaultIncludeCriteria();
+	boolean getDefaultIncludeCriteria();
 		String DEFAULT_INCLUDE_CRITERIA_PROPERTY = "defaultIncludeCriteria"; //$NON-NLS-1$
 		boolean DEFAULT_INCLUDE_CRITERIA = true;
 
@@ -158,5 +157,4 @@ public interface EclipseLinkMultitenancy2_3
 	 * have the primaryKey option set to true
 	 */
  	boolean usesPrimaryKeyTenantDiscriminatorColumns();
-
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java
index 7118e9300e..723bbf9ed2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMutable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -25,11 +25,10 @@ public interface EclipseLinkMutable
 	extends JpaContextModel
 {
 	boolean isMutable();
-	
+		String MUTABLE_PROPERTY = "mutable";  //$NON-NLS-1$
 	Boolean getSpecifiedMutable();
 	void setSpecifiedMutable(Boolean mutable);
 		String SPECIFIED_MUTABLE_PROPERTY = "specifiedMutable";  //$NON-NLS-1$
-	
-	boolean isDefaultMutable();
+	boolean getDefaultMutable();
 		String DEFAULT_MUTABLE_PROPERTY = "defaultMutable";  //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java
index d92d9ad73a..a3f4fd37f5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkReadOnly.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -27,12 +27,11 @@ public interface EclipseLinkReadOnly
 	extends JpaContextModel
 {
 	boolean isReadOnly();
-
-	boolean isDefaultReadOnly();
-		String DEFAULT_READ_ONLY_PROPERTY = "defaultReadOnly"; //$NON-NLS-1$
-		boolean DEFAULT_READ_ONLY = false;
-
+		String READ_ONLY_PROPERTY = "readOnly"; //$NON-NLS-1$
 	Boolean getSpecifiedReadOnly();
 	void setSpecifiedReadOnly(Boolean newSpecifiedReadOnly);
 		String SPECIFIED_READ_ONLY_PROPERTY = "specifiedReadOnly"; //$NON-NLS-1$
+	boolean getDefaultReadOnly();
+		String DEFAULT_READ_ONLY_PROPERTY = "defaultReadOnly"; //$NON-NLS-1$
+		boolean DEFAULT_READ_ONLY = false;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTenantDiscriminatorColumn2_3.java
index 5a0e442e38..a8d3771f90 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -51,11 +51,12 @@ public interface EclipseLinkTenantDiscriminatorColumn2_3
 	 * default primaryKey setting.
 	 */
 	boolean isPrimaryKey();
+		String PRIMARY_KEY_PROPERTY = "primaryKey"; //$NON-NLS-1$
 	Boolean getSpecifiedPrimaryKey();
 		String SPECIFIED_PRIMARY_KEY_PROPERTY = "specifiedPrimaryKey"; //$NON-NLS-1$
-	boolean isDefaultPrimaryKey();
+	boolean getDefaultPrimaryKey();
 		String DEFAULT_PRIMARY_KEY_PROPERTY = "defaultPrimaryKey"; //$NON-NLS-1$
-	boolean DEFAULT_PRIMARY_KEY = false;
+		boolean DEFAULT_PRIMARY_KEY = false;
 
 
 	// ********** parent adapter **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCaching.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCaching.java
index a77eae6d39..b482de7abd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCaching.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCaching.java
@@ -9,11 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -22,134 +18,59 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkCaching
 	extends PersistenceUnitProperties
 {
-	EclipseLinkCacheType getDefaultCacheTypeDefault();
-	Transformer<EclipseLinkCaching, EclipseLinkCacheType> DEFAULT_CACHE_TYPE_DEFAULT_TRANSFORMER = new DefaultCacheTypeDefaultTransformer();
-	class DefaultCacheTypeDefaultTransformer
-		extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-	{
-		@Override
-		public EclipseLinkCacheType transform(EclipseLinkCaching caching) {
-			return caching.getDefaultCacheTypeDefault();
-		}
-	}
-
 	EclipseLinkCacheType getCacheTypeDefault();
-		Transformer<EclipseLinkCaching, EclipseLinkCacheType> CACHE_TYPE_DEFAULT_TRANSFORMER = new CacheTypeDefaultTransformer();
-		class CacheTypeDefaultTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-		{
-			@Override
-			public EclipseLinkCacheType transform(EclipseLinkCaching caching) {
-				return caching.getCacheTypeDefault();
-			}
-		}
 	void setCacheTypeDefault(EclipseLinkCacheType cacheTypeDefault);
 		String CACHE_TYPE_DEFAULT_PROPERTY = "cacheTypeDefault"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_CACHE_TYPE_DEFAULT = "eclipselink.cache.type.default"; //$NON-NLS-1$
+	EclipseLinkCacheType getDefaultCacheTypeDefault();
 		EclipseLinkCacheType DEFAULT_CACHE_TYPE_DEFAULT = EclipseLinkCacheType.soft_weak;
-		BiClosure<EclipseLinkCaching, EclipseLinkCacheType> SET_CACHE_TYPE_DEFAULT_CLOSURE = new SetCacheTypeDefaultClosure();
-		class SetCacheTypeDefaultClosure
-			extends BiClosureAdapter<EclipseLinkCaching, EclipseLinkCacheType>
-		{
-			@Override
-			public void execute(EclipseLinkCaching caching, EclipseLinkCacheType cacheTypeDefault) {
-				caching.setCacheTypeDefault(cacheTypeDefault);
-			}
-		}
-
-	Integer getDefaultCacheSizeDefault();
-		Transformer<EclipseLinkCaching, Integer> DEFAULT_CACHE_SIZE_DEFAULT_TRANSFORMER = new DefaultCacheSizeDefaultTransformer();
-		class DefaultCacheSizeDefaultTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Integer>
-		{
-			@Override
-			public Integer transform(EclipseLinkCaching caching) {
-				return caching.getDefaultCacheSizeDefault();
-			}
-		}
 
 	Integer getCacheSizeDefault();
 	void setCacheSizeDefault(Integer cacheSizeDefault);
 		String CACHE_SIZE_DEFAULT_PROPERTY = "cacheSizeDefault"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_CACHE_SIZE_DEFAULT = "eclipselink.cache.size.default"; //$NON-NLS-1$
+	Integer getDefaultCacheSizeDefault();
 		Integer DEFAULT_CACHE_SIZE_DEFAULT = Integer.valueOf(100);
 
-	Boolean getDefaultSharedCacheDefault();
-		Transformer<EclipseLinkCaching, Boolean> DEFAULT_SHARED_CACHE_DEFAULT_TRANSFORMER = new DefaultSharedCacheDefaultTransformer();
-		class DefaultSharedCacheDefaultTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching caching) {
-				return caching.getDefaultSharedCacheDefault();
-			}
-		}
-
 	Boolean getSharedCacheDefault();
-		Transformer<EclipseLinkCaching, Boolean> SHARED_CACHE_DEFAULT_TRANSFORMER = new SharedCacheDefaultTransformer();
-		class SharedCacheDefaultTransformer
-			extends TransformerAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCaching caching) {
-				return caching.getSharedCacheDefault();
-			}
-		}
 	void setSharedCacheDefault(Boolean sharedCacheDefault);
 		String SHARED_CACHE_DEFAULT_PROPERTY = "sharedCacheDefault"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_CACHE_SHARED_DEFAULT = "eclipselink.cache.shared.default"; //$NON-NLS-1$
+	Boolean getDefaultSharedCacheDefault();
+		String DEFAULT_SHARED_CACHE_DEFAULT_PROPERTY = "defaultSharedCacheDefault"; //$NON-NLS-1$
 		Boolean DEFAULT_SHARED_CACHE_DEFAULT = Boolean.TRUE;
-		BiClosure<EclipseLinkCaching, Boolean> SET_SHARED_CACHE_DEFAULT_CLOSURE = new SetSharedCacheDefaultClosure();
-		class SetSharedCacheDefaultClosure
-			extends BiClosureAdapter<EclipseLinkCaching, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCaching caching, Boolean sharedCacheDefault) {
-				caching.setSharedCacheDefault(sharedCacheDefault);
-			}
-		}
-
 
-	EclipseLinkCacheType getDefaultEntityCacheType();
 	EclipseLinkCacheType getEntityCacheType(String entityName);
 	void setEntityCacheType(String entityName, EclipseLinkCacheType cacheType);
 		// EclipseLink key string
 		String ECLIPSELINK_CACHE_TYPE = "eclipselink.cache.type."; //$NON-NLS-1$
+	EclipseLinkCacheType getDefaultEntityCacheType();
 		EclipseLinkCacheType DEFAULT_ENTITY_CACHE_TYPE = EclipseLinkCacheType.soft_weak;
 
-	Integer getDefaultEntityCacheSize();
 	Integer getEntityCacheSize(String entityName);
 	void setEntityCacheSize(String entityName, Integer cacheSize);
 		// EclipseLink key string
 		String ECLIPSELINK_CACHE_SIZE = "eclipselink.cache.size."; //$NON-NLS-1$
+	Integer getDefaultEntityCacheSize();
 		Integer DEFAULT_ENTITY_CACHE_SIZE = Integer.valueOf(100);
 
-	Boolean getDefaultEntitySharedCache();
 	Boolean getEntitySharedCache(String entityName);
 	void setEntitySharedCache(String entityName, Boolean sharedCache);
 		// EclipseLink key string
 		String ECLIPSELINK_SHARED_CACHE = "eclipselink.cache.shared."; //$NON-NLS-1$
+	Boolean getDefaultEntitySharedCache();
 		Boolean DEFAULT_ENTITY_SHARED_CACHE = Boolean.TRUE;
 
-	EclipseLinkFlushClearCache getDefaultFlushClearCache();
-		Transformer<EclipseLinkCaching, EclipseLinkFlushClearCache> DEFAULT_FLUSH_CLEAR_CACHE_TRANSFORMER = new DefaultFlushClearCacheTransformer();
-		class DefaultFlushClearCacheTransformer
-			extends TransformerAdapter<EclipseLinkCaching, EclipseLinkFlushClearCache>
-		{
-			@Override
-			public EclipseLinkFlushClearCache transform(EclipseLinkCaching caching) {
-				return caching.getDefaultFlushClearCache();
-			}
-		}
-
 	EclipseLinkFlushClearCache getFlushClearCache();
 	void setFlushClearCache(EclipseLinkFlushClearCache newFlushClearCache);
 		String FLUSH_CLEAR_CACHE_PROPERTY = "flushClearCache"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_FLUSH_CLEAR_CACHE = "eclipselink.flush-clear.cache"; //$NON-NLS-1$
+
+	EclipseLinkFlushClearCache getDefaultFlushClearCache();
 		EclipseLinkFlushClearCache DEFAULT_FLUSH_CLEAR_CACHE = EclipseLinkFlushClearCache.drop_invalidate;
 
 	void removeDefaultCachingProperties();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkConnection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkConnection.java
index a27a139b58..5ea2f45475 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkConnection.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkConnection.java
@@ -9,8 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -19,182 +17,148 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkConnection
 	extends PersistenceUnitProperties
 {
-	Boolean getDefaultNativeSql();
 	Boolean getNativeSql();
 	void setNativeSql(Boolean newNativeSql);
-		static final String NATIVE_SQL_PROPERTY = "nativeSql"; //$NON-NLS-1$
+		String NATIVE_SQL_PROPERTY = "nativeSql"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_NATIVE_SQL = "eclipselink.jdbc.native-sql"; //$NON-NLS-1$
-		static final Boolean DEFAULT_NATIVE_SQL = Boolean.FALSE;
+		String ECLIPSELINK_NATIVE_SQL = "eclipselink.jdbc.native-sql"; //$NON-NLS-1$
+	Boolean getDefaultNativeSql();
+		String DEFAULT_NATIVE_SQL_PROPERTY = "defaultNativeSql"; //$NON-NLS-1$
+		Boolean DEFAULT_NATIVE_SQL = Boolean.FALSE;
 
-	EclipseLinkBatchWriting getDefaultBatchWriting();
 	EclipseLinkBatchWriting getBatchWriting();
 	void setBatchWriting(EclipseLinkBatchWriting newBatchWriting);
-		static final String BATCH_WRITING_PROPERTY = "batchWriting"; //$NON-NLS-1$
+		String BATCH_WRITING_PROPERTY = "batchWriting"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_BATCH_WRITING = "eclipselink.jdbc.batch-writing"; //$NON-NLS-1$
-		static final EclipseLinkBatchWriting DEFAULT_BATCH_WRITING = EclipseLinkBatchWriting.none;
+		String ECLIPSELINK_BATCH_WRITING = "eclipselink.jdbc.batch-writing"; //$NON-NLS-1$
+	EclipseLinkBatchWriting getDefaultBatchWriting();
+		String DEFAULT_BATCH_WRITING_PROPERTY = "defaultBatchWriting"; //$NON-NLS-1$
+		EclipseLinkBatchWriting DEFAULT_BATCH_WRITING = EclipseLinkBatchWriting.none;
 
-	Boolean getDefaultCacheStatements();
 	Boolean getCacheStatements();
 	void setCacheStatements(Boolean newCacheStatements);
-		static final String CACHE_STATEMENTS_PROPERTY = "cacheStatements"; //$NON-NLS-1$
+		String CACHE_STATEMENTS_PROPERTY = "cacheStatements"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_STATEMENTS = "eclipselink.jdbc.cache-statements"; //$NON-NLS-1$
-		static final Boolean DEFAULT_CACHE_STATEMENTS = Boolean.FALSE;
-
-	Integer getDefaultCacheStatementsSize();
-	Transformer<EclipseLinkConnection, Integer> DEFAULT_CACHE_STATEMENTS_SIZE_TRANSFORMER = new DefaultCacheStatementsSizeTransformer();
-	class DefaultCacheStatementsSizeTransformer
-		extends TransformerAdapter<EclipseLinkConnection, Integer>
-	{
-		@Override
-		public Integer transform(EclipseLinkConnection connection) {
-			return connection.getDefaultCacheStatementsSize();
-		}
-	}
+		String ECLIPSELINK_CACHE_STATEMENTS = "eclipselink.jdbc.cache-statements"; //$NON-NLS-1$
+	Boolean getDefaultCacheStatements();
+		String DEFAULT_CACHE_STATEMENTS_PROPERTY = "defaultCacheStatements"; //$NON-NLS-1$
+		Boolean DEFAULT_CACHE_STATEMENTS = Boolean.FALSE;
 
 	Integer getCacheStatementsSize();
 	void setCacheStatementsSize(Integer newCacheStatementsSize);
-		static final String CACHE_STATEMENTS_SIZE_PROPERTY = "cacheStatementsSize"; //$NON-NLS-1$
+		String CACHE_STATEMENTS_SIZE_PROPERTY = "cacheStatementsSize"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_CACHE_STATEMENTS_SIZE = "eclipselink.jdbc.cache-statements.size"; //$NON-NLS-1$
-		static final Integer DEFAULT_CACHE_STATEMENTS_SIZE = Integer.valueOf(50);
+		String ECLIPSELINK_CACHE_STATEMENTS_SIZE = "eclipselink.jdbc.cache-statements.size"; //$NON-NLS-1$
+	Integer getDefaultCacheStatementsSize();
+		String DEFAULT_CACHE_STATEMENTS_SIZE_PROPERTY = "defaultCacheStatementsSize"; //$NON-NLS-1$
+		Integer DEFAULT_CACHE_STATEMENTS_SIZE = Integer.valueOf(50);
 
-	String getDefaultDriver();
 	String getDriver();
 	void setDriver(String newDriver);
-		static final String DRIVER_PROPERTY = "driver"; //$NON-NLS-1$
+		String DRIVER_PROPERTY = "driver"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_DRIVER = "eclipselink.jdbc.driver"; //$NON-NLS-1$
-		static final String DEFAULT_DRIVER = ""; //$NON-NLS-1$
+		String ECLIPSELINK_DRIVER = "eclipselink.jdbc.driver"; //$NON-NLS-1$
+	String getDefaultDriver();
+		String DEFAULT_DRIVER_PROPERTY = "defaultDriver"; //$NON-NLS-1$
+		String DEFAULT_DRIVER = ""; //$NON-NLS-1$
 
-	String getDefaultUrl();
 	String getUrl();
 	void setUrl(String newUrl);
-		static final String URL_PROPERTY = "url"; //$NON-NLS-1$
+		String URL_PROPERTY = "url"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_URL = "eclipselink.jdbc.url"; //$NON-NLS-1$
-		static final String DEFAULT_URL = ""; //$NON-NLS-1$
+		String ECLIPSELINK_URL = "eclipselink.jdbc.url"; //$NON-NLS-1$
+	String getDefaultUrl();
+		String DEFAULT_URL_PROPERTY = "defaultUrl"; //$NON-NLS-1$
+		String DEFAULT_URL = ""; //$NON-NLS-1$
 
-	String getDefaultUser();
 	String getUser();
 	void setUser(String newUser);
-		static final String USER_PROPERTY = "user"; //$NON-NLS-1$
+		String USER_PROPERTY = "user"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_USER = "eclipselink.jdbc.user"; //$NON-NLS-1$
-		static final String DEFAULT_USER = ""; //$NON-NLS-1$
+		String ECLIPSELINK_USER = "eclipselink.jdbc.user"; //$NON-NLS-1$
+	String getDefaultUser();
+		String DEFAULT_USER_PROPERTY = "defaultUser"; //$NON-NLS-1$
+		String DEFAULT_USER = ""; //$NON-NLS-1$
 
-	String getDefaultPassword();
 	String getPassword();
 	void setPassword(String newPassword);
-		static final String PASSWORD_PROPERTY = "password"; //$NON-NLS-1$
+		String PASSWORD_PROPERTY = "password"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_PASSWORD = "eclipselink.jdbc.password"; //$NON-NLS-1$
-		static final String DEFAULT_PASSWORD = ""; //$NON-NLS-1$
+		String ECLIPSELINK_PASSWORD = "eclipselink.jdbc.password"; //$NON-NLS-1$
+	String getDefaultPassword();
+		String DEFAULT_PASSWORD_PROPERTY = "defaultPassword"; //$NON-NLS-1$
+		String DEFAULT_PASSWORD = ""; //$NON-NLS-1$
 
-	Boolean getDefaultBindParameters();
 	Boolean getBindParameters();
 	void setBindParameters(Boolean newBindParameters);
-		static final String BIND_PARAMETERS_PROPERTY = "bindParameters"; //$NON-NLS-1$
+		String BIND_PARAMETERS_PROPERTY = "bindParameters"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_BIND_PARAMETERS = "eclipselink.jdbc.bind-parameters"; //$NON-NLS-1$
-		static final Boolean DEFAULT_BIND_PARAMETERS = Boolean.TRUE;
+		String ECLIPSELINK_BIND_PARAMETERS = "eclipselink.jdbc.bind-parameters"; //$NON-NLS-1$
+	Boolean getDefaultBindParameters();
+		String DEFAULT_BIND_PARAMETERS_PROPERTY = "defaultBindParameters"; //$NON-NLS-1$
+		Boolean DEFAULT_BIND_PARAMETERS = Boolean.TRUE;
 
-	Boolean getDefaultReadConnectionsShared();
 	Boolean getReadConnectionsShared();
 	void setReadConnectionsShared(Boolean newReadConnectionsShared);
-		static final String READ_CONNECTIONS_SHARED_PROPERTY = "readConnectionsShared"; //$NON-NLS-1$
+		String READ_CONNECTIONS_SHARED_PROPERTY = "readConnectionsShared"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_SHARED = "eclipselink.jdbc.read-connections.shared"; //$NON-NLS-1$
-		static final Boolean DEFAULT_READ_CONNECTIONS_SHARED = Boolean.FALSE;
-
-	Integer getDefaultReadConnectionsMin();
-	Transformer<EclipseLinkConnection, Integer> DEFAULT_READ_CONNECTIONS_MIN_TRANSFORMER = new DefaultReadConnectionsMinTransformer();
-	class DefaultReadConnectionsMinTransformer
-		extends TransformerAdapter<EclipseLinkConnection, Integer>
-	{
-		@Override
-		public Integer transform(EclipseLinkConnection connection) {
-			return connection.getDefaultReadConnectionsMin();
-		}
-	}
+		String ECLIPSELINK_READ_CONNECTIONS_SHARED = "eclipselink.jdbc.read-connections.shared"; //$NON-NLS-1$
+	Boolean getDefaultReadConnectionsShared();
+		String DEFAULT_READ_CONNECTIONS_SHARED_PROPERTY = "defaultReadConnectionsShared"; //$NON-NLS-1$
+		Boolean DEFAULT_READ_CONNECTIONS_SHARED = Boolean.FALSE;
 
 	Integer getReadConnectionsMin();
 	void setReadConnectionsMin(Integer newReadConnectionsMin);
-		static final String READ_CONNECTIONS_MIN_PROPERTY = "readConnectionsMin"; //$NON-NLS-1$
+		String READ_CONNECTIONS_MIN_PROPERTY = "readConnectionsMin"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_MIN = "eclipselink.jdbc.read-connections.min"; //$NON-NLS-1$
-		static final Integer DEFAULT_READ_CONNECTIONS_MIN = Integer.valueOf(2);
-
-	Integer getDefaultReadConnectionsMax();
-	Transformer<EclipseLinkConnection, Integer> DEFAULT_READ_CONNECTIONS_MAX_TRANSFORMER = new DefaultReadConnectionsMaxTransformer();
-	class DefaultReadConnectionsMaxTransformer
-		extends TransformerAdapter<EclipseLinkConnection, Integer>
-	{
-		@Override
-		public Integer transform(EclipseLinkConnection connection) {
-			return connection.getDefaultReadConnectionsMax();
-		}
-	}
+		String ECLIPSELINK_READ_CONNECTIONS_MIN = "eclipselink.jdbc.read-connections.min"; //$NON-NLS-1$
+	Integer getDefaultReadConnectionsMin();
+		String DEFAULT_READ_CONNECTIONS_MIN_PROPERTY = "defaultReadConnectionsMin"; //$NON-NLS-1$
+		Integer DEFAULT_READ_CONNECTIONS_MIN = Integer.valueOf(2);
 
 	Integer getReadConnectionsMax();
 	void setReadConnectionsMax(Integer newReadConnectionsMax);
-		static final String READ_CONNECTIONS_MAX_PROPERTY = "readConnectionsMax"; //$NON-NLS-1$
+		String READ_CONNECTIONS_MAX_PROPERTY = "readConnectionsMax"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_READ_CONNECTIONS_MAX = "eclipselink.jdbc.read-connections.max"; //$NON-NLS-1$
-		static final Integer DEFAULT_READ_CONNECTIONS_MAX = Integer.valueOf(2);
-
-	Integer getDefaultWriteConnectionsMin();
-	Transformer<EclipseLinkConnection, Integer> DEFAULT_WRITE_CONNECTIONS_MIN_TRANSFORMER = new DefaultWriteConnectionsMinTransformer();
-	class DefaultWriteConnectionsMinTransformer
-		extends TransformerAdapter<EclipseLinkConnection, Integer>
-	{
-		@Override
-		public Integer transform(EclipseLinkConnection connection) {
-			return connection.getDefaultWriteConnectionsMin();
-		}
-	}
+		String ECLIPSELINK_READ_CONNECTIONS_MAX = "eclipselink.jdbc.read-connections.max"; //$NON-NLS-1$
+	Integer getDefaultReadConnectionsMax();
+		String DEFAULT_READ_CONNECTIONS_MAX_PROPERTY = "defaultReadConnectionsMax"; //$NON-NLS-1$
+		Integer DEFAULT_READ_CONNECTIONS_MAX = Integer.valueOf(2);
 
 	Integer getWriteConnectionsMin();
 	void setWriteConnectionsMin(Integer newWriteConnectionsMin);
-		static final String WRITE_CONNECTIONS_MIN_PROPERTY = "writeConnectionsMin"; //$NON-NLS-1$
+		String WRITE_CONNECTIONS_MIN_PROPERTY = "writeConnectionsMin"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WRITE_CONNECTIONS_MIN = "eclipselink.jdbc.write-connections.min"; //$NON-NLS-1$
-		static final Integer DEFAULT_WRITE_CONNECTIONS_MIN = Integer.valueOf(5);
+		String ECLIPSELINK_WRITE_CONNECTIONS_MIN = "eclipselink.jdbc.write-connections.min"; //$NON-NLS-1$
+	Integer getDefaultWriteConnectionsMin();
+		String DEFAULT_WRITE_CONNECTIONS_MIN_PROPERTY = "defaultWriteConnectionsMin"; //$NON-NLS-1$
+		Integer DEFAULT_WRITE_CONNECTIONS_MIN = Integer.valueOf(5);
 
-	Integer getDefaultWriteConnectionsMax();
-	Transformer<EclipseLinkConnection, Integer> DEFAULT_WRITE_CONNECTIONS_MAX_TRANSFORMER = new DefaultWriteConnectionsMaxTransformer();
-	class DefaultWriteConnectionsMaxTransformer
-		extends TransformerAdapter<EclipseLinkConnection, Integer>
-	{
-		@Override
-		public Integer transform(EclipseLinkConnection connection) {
-			return connection.getDefaultWriteConnectionsMax();
-		}
-	}
 
 	Integer getWriteConnectionsMax();
 	void setWriteConnectionsMax(Integer newWriteConnectionsMax);
-		static final String WRITE_CONNECTIONS_MAX_PROPERTY = "writeConnectionsMax"; //$NON-NLS-1$
+		String WRITE_CONNECTIONS_MAX_PROPERTY = "writeConnectionsMax"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WRITE_CONNECTIONS_MAX = "eclipselink.jdbc.write-connections.max"; //$NON-NLS-1$
-		static final Integer DEFAULT_WRITE_CONNECTIONS_MAX = Integer.valueOf(10);
+		String ECLIPSELINK_WRITE_CONNECTIONS_MAX = "eclipselink.jdbc.write-connections.max"; //$NON-NLS-1$
+	Integer getDefaultWriteConnectionsMax();
+		String DEFAULT_WRITE_CONNECTIONS_MAX_PROPERTY = "defaultWriteConnectionsMax"; //$NON-NLS-1$
+		Integer DEFAULT_WRITE_CONNECTIONS_MAX = Integer.valueOf(10);
 
-	EclipseLinkExclusiveConnectionMode getDefaultExclusiveConnectionMode();
 	EclipseLinkExclusiveConnectionMode getExclusiveConnectionMode();
 	void setExclusiveConnectionMode(EclipseLinkExclusiveConnectionMode newExclusiveConnectionMode);
-		static final String EXCLUSIVE_CONNECTION_MODE_PROPERTY = "exclusiveConnectionMode"; //$NON-NLS-1$
+		String EXCLUSIVE_CONNECTION_MODE_PROPERTY = "exclusiveConnectionMode"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE = "eclipselink.jdbc.exclusive-connection.mode"; //$NON-NLS-1$
-		static final EclipseLinkExclusiveConnectionMode DEFAULT_EXCLUSIVE_CONNECTION_MODE = EclipseLinkExclusiveConnectionMode.transactional;
+		String ECLIPSELINK_EXCLUSIVE_CONNECTION_MODE = "eclipselink.jdbc.exclusive-connection.mode"; //$NON-NLS-1$
+	EclipseLinkExclusiveConnectionMode getDefaultExclusiveConnectionMode();
+		String DEFAULT_EXCLUSIVE_CONNECTION_MODE_PROPERTY = "defaultExclusiveConnectionMode"; //$NON-NLS-1$
+		EclipseLinkExclusiveConnectionMode DEFAULT_EXCLUSIVE_CONNECTION_MODE = EclipseLinkExclusiveConnectionMode.transactional;
 
-	Boolean getDefaultLazyConnection();
 	Boolean getLazyConnection();
 	void setLazyConnection(Boolean newLazyConnection);
-		static final String LAZY_CONNECTION_PROPERTY = "lazyConnection"; //$NON-NLS-1$
+		String LAZY_CONNECTION_PROPERTY = "lazyConnection"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_LAZY_CONNECTION = "eclipselink.jdbc.exclusive-connection.is-lazy"; //$NON-NLS-1$
-		static final Boolean DEFAULT_LAZY_CONNECTION = Boolean.TRUE;
-
+		String ECLIPSELINK_LAZY_CONNECTION = "eclipselink.jdbc.exclusive-connection.is-lazy"; //$NON-NLS-1$
+	Boolean getDefaultLazyConnection();
+		String DEFAULT_LAZY_CONNECTION_PROPERTY = "defaultLazyConnection"; //$NON-NLS-1$
+		Boolean DEFAULT_LAZY_CONNECTION = Boolean.TRUE;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCustomization.java
index 4f2872e76e..5b0dbd5259 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCustomization.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkCustomization.java
@@ -9,109 +9,96 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.iterable.ListIterable;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
- *  Customization
+ * EclipseLink Customization
  */
-public interface EclipseLinkCustomization extends PersistenceUnitProperties
+public interface EclipseLinkCustomization
+	extends PersistenceUnitProperties
 {
-	Boolean getDefaultThrowExceptions();
 	Boolean getThrowExceptions();
 	void setThrowExceptions(Boolean newThrowExceptions);
-		static final String THROW_EXCEPTIONS_PROPERTY = "throwExceptions"; //$NON-NLS-1$
+		String THROW_EXCEPTIONS_PROPERTY = "throwExceptions"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_THROW_EXCEPTIONS = "eclipselink.orm.throw.exceptions"; //$NON-NLS-1$
-		static final Boolean DEFAULT_THROW_EXCEPTIONS = Boolean.TRUE;
-		Transformer<EclipseLinkCustomization, Boolean> THROW_EXCEPTIONS_TRANSFORMER = new ThrowExceptionsTransformer();
-		class ThrowExceptionsTransformer
-			extends TransformerAdapter<EclipseLinkCustomization, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkCustomization model) {
-				return model.getThrowExceptions();
-			}
-		}
-		BiClosure<EclipseLinkCustomization, Boolean> SET_THROW_EXCEPTIONS_CLOSURE = new SetThrowExceptionsClosure();
-		class SetThrowExceptionsClosure
-			extends BiClosureAdapter<EclipseLinkCustomization, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkCustomization model, Boolean name) {
-				model.setThrowExceptions(name);
-			}
-		}
+		String ECLIPSELINK_THROW_EXCEPTIONS = "eclipselink.orm.throw.exceptions"; //$NON-NLS-1$
+	Boolean getDefaultThrowExceptions();
+		String DEFAULT_THROW_EXCEPTIONS_PROPERTY = "defaultThrowExceptions"; //$NON-NLS-1$
+		Boolean DEFAULT_THROW_EXCEPTIONS = Boolean.TRUE;
 
-	EclipseLinkWeaving getDefaultWeaving();
 	EclipseLinkWeaving getWeaving();
 	void setWeaving(EclipseLinkWeaving newWeaving);
-		static final String WEAVING_PROPERTY = "weaving"; //$NON-NLS-1$
+		String WEAVING_PROPERTY = "weaving"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING = "eclipselink.weaving"; //$NON-NLS-1$
-		static final EclipseLinkWeaving DEFAULT_WEAVING = EclipseLinkWeaving.true_;
+		String ECLIPSELINK_WEAVING = "eclipselink.weaving"; //$NON-NLS-1$
+	EclipseLinkWeaving getDefaultWeaving();
+		String DEFAULT_WEAVING_PROPERTY = "defaultWeaving"; //$NON-NLS-1$
+		EclipseLinkWeaving DEFAULT_WEAVING = EclipseLinkWeaving.true_;
  
-	Boolean getDefaultWeavingLazy();
 	Boolean getWeavingLazy();
 	void setWeavingLazy(Boolean newWeavingLazy);
-		static final String WEAVING_LAZY_PROPERTY = "weavingLazy"; //$NON-NLS-1$
+		String WEAVING_LAZY_PROPERTY = "weavingLazy"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_LAZY = "eclipselink.weaving.lazy"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_LAZY = Boolean.TRUE;
-	
-	Boolean getDefaultWeavingChangeTracking();
+		String ECLIPSELINK_WEAVING_LAZY = "eclipselink.weaving.lazy"; //$NON-NLS-1$
+	Boolean getDefaultWeavingLazy();
+		String DEFAULT_WEAVING_LAZY_PROPERTY = "defaultWeavingLazy"; //$NON-NLS-1$
+		Boolean DEFAULT_WEAVING_LAZY = Boolean.TRUE;
+
 	Boolean getWeavingChangeTracking();
 	void setWeavingChangeTracking(Boolean newWeavingChangeTracking);
-		static final String WEAVING_CHANGE_TRACKING_PROPERTY = "weavingChangeTracking"; //$NON-NLS-1$
+		String WEAVING_CHANGE_TRACKING_PROPERTY = "weavingChangeTracking"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_CHANGE_TRACKING = "eclipselink.weaving.changetracking"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_CHANGE_TRACKING = Boolean.TRUE;
+		String ECLIPSELINK_WEAVING_CHANGE_TRACKING = "eclipselink.weaving.changetracking"; //$NON-NLS-1$
+	Boolean getDefaultWeavingChangeTracking();
+		String DEFAULT_WEAVING_CHANGE_TRACKING_PROPERTY = "defaultWeavingChangeTracking"; //$NON-NLS-1$
+		Boolean DEFAULT_WEAVING_CHANGE_TRACKING = Boolean.TRUE;
 
-	Boolean getDefaultWeavingFetchGroups();
 	Boolean getWeavingFetchGroups();
 	void setWeavingFetchGroups(Boolean newWeavingFetchGroups);
-		static final String WEAVING_FETCH_GROUPS_PROPERTY = "weavingFetchGroups"; //$NON-NLS-1$
+		String WEAVING_FETCH_GROUPS_PROPERTY = "weavingFetchGroups"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_FETCH_GROUPS = "eclipselink.weaving.fetchgroups"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_FETCH_GROUPS = Boolean.TRUE;
+		String ECLIPSELINK_WEAVING_FETCH_GROUPS = "eclipselink.weaving.fetchgroups"; //$NON-NLS-1$
+	Boolean getDefaultWeavingFetchGroups();
+		String DEFAULT_WEAVING_FETCH_GROUPS_PROPERTY = "defaultWeavingFetchGroups"; //$NON-NLS-1$
+		Boolean DEFAULT_WEAVING_FETCH_GROUPS = Boolean.TRUE;
 
-	Boolean getDefaultWeavingInternal();
 	Boolean getWeavingInternal();
 	void setWeavingInternal(Boolean newWeavingInternal);
-		static final String WEAVING_INTERNAL_PROPERTY = "weavingInternal"; //$NON-NLS-1$
+		String WEAVING_INTERNAL_PROPERTY = "weavingInternal"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_INTERNAL = "eclipselink.weaving.internal"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_INTERNAL = Boolean.TRUE;
+		String ECLIPSELINK_WEAVING_INTERNAL = "eclipselink.weaving.internal"; //$NON-NLS-1$
+	Boolean getDefaultWeavingInternal();
+		String DEFAULT_WEAVING_INTERNAL_PROPERTY = "defaultWeavingInternal"; //$NON-NLS-1$
+		Boolean DEFAULT_WEAVING_INTERNAL = Boolean.TRUE;
 
-	Boolean getDefaultWeavingEager();
 	Boolean getWeavingEager();
 	void setWeavingEager(Boolean newWeavingEager);
-		static final String WEAVING_EAGER_PROPERTY = "weavingEager"; //$NON-NLS-1$
+		String WEAVING_EAGER_PROPERTY = "weavingEager"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_WEAVING_EAGER = "eclipselink.weaving.eager"; //$NON-NLS-1$
-		static final Boolean DEFAULT_WEAVING_EAGER = Boolean.FALSE;
+		String ECLIPSELINK_WEAVING_EAGER = "eclipselink.weaving.eager"; //$NON-NLS-1$
+	Boolean getDefaultWeavingEager();
+		String DEFAULT_WEAVING_EAGER_PROPERTY = "defaultWeavingEager"; //$NON-NLS-1$
+		Boolean DEFAULT_WEAVING_EAGER = Boolean.FALSE;
 
-	String getDefaultDescriptorCustomizer();
 	String getDescriptorCustomizerOf(String entityName);
 	void setDescriptorCustomizerOf(String entityName, String newDescriptorCustomizer);
-		static final String DESCRIPTOR_CUSTOMIZER_PROPERTY = "descriptorCustomizer"; //$NON-NLS-1$
+		String DESCRIPTOR_CUSTOMIZER_PROPERTY = "descriptorCustomizer"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER = "eclipselink.descriptor.customizer."; //$NON-NLS-1$
-		static final String DEFAULT_DESCRIPTOR_CUSTOMIZER = null;	// no default
+		String ECLIPSELINK_DESCRIPTOR_CUSTOMIZER = "eclipselink.descriptor.customizer."; //$NON-NLS-1$
+	String getDefaultDescriptorCustomizer();
+		String DEFAULT_DESCRIPTOR_CUSTOMIZER_PROPERTY = "defaultDescriptorCustomizer"; //$NON-NLS-1$
+		String DEFAULT_DESCRIPTOR_CUSTOMIZER = null;	// no default
 
 	ListIterable<String> getSessionCustomizers();
 	int getSessionCustomizersSize();
 	boolean sessionCustomizerExists(String sessionCustomizerClassName);
 	String addSessionCustomizer(String newSessionCustomizerClassName);
 	void removeSessionCustomizer(String sessionCustomizerClassName);
-		static final String SESSION_CUSTOMIZER_LIST = "sessionCustomizers"; //$NON-NLS-1$
-		static final String SESSION_CUSTOMIZER_PROPERTY = "sessionCustomizer"; //$NON-NLS-1$
+		String SESSION_CUSTOMIZER_LIST = "sessionCustomizers"; //$NON-NLS-1$
+		String SESSION_CUSTOMIZER_PROPERTY = "sessionCustomizer"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_SESSION_CUSTOMIZER = "eclipselink.session.customizer"; //$NON-NLS-1$
+		String ECLIPSELINK_SESSION_CUSTOMIZER = "eclipselink.session.customizer"; //$NON-NLS-1$
 		String ECLIPSELINK_SESSION_CUSTOMIZER_CLASS_NAME = "org.eclipse.persistence.config.SessionCustomizer"; //$NON-NLS-1$
 
 	ListIterable<EclipseLinkCustomizationEntity> getEntities();
@@ -120,41 +107,45 @@ public interface EclipseLinkCustomization extends PersistenceUnitProperties
 	boolean entityExists(String entity);
 	EclipseLinkCustomizationEntity addEntity(String entity);
 	void removeEntity(String entity);
-		static final String ENTITIES_LIST = "entities"; //$NON-NLS-1$
+		String ENTITIES_LIST = "entities"; //$NON-NLS-1$
 		
-	String getDefaultProfiler();
 	String getProfiler();
 	void setProfiler(String newProfiler);
 	void setProfiler(EclipseLinkProfiler newProfiler);
-		static final String PROFILER_PROPERTY = "profiler"; //$NON-NLS-1$
+		String PROFILER_PROPERTY = "profiler"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_PROFILER = "eclipselink.profiler"; //$NON-NLS-1$
-		static final String DEFAULT_PROFILER = EclipseLinkProfiler.no_profiler.getPropertyValue();
-		static final String[] RESERVED_PROFILER_NAMES = {EclipseLinkProfiler.no_profiler.getPropertyValue(), EclipseLinkProfiler.performance_profiler.getPropertyValue(), EclipseLinkProfiler.query_monitor.getPropertyValue()};
+		String ECLIPSELINK_PROFILER = "eclipselink.profiler"; //$NON-NLS-1$
+	String getDefaultProfiler();
+		String DEFAULT_PROFILER_PROPERTY = "defaultProfiler"; //$NON-NLS-1$
+		String DEFAULT_PROFILER = EclipseLinkProfiler.no_profiler.getPropertyValue();
+		String[] RESERVED_PROFILER_NAMES = {EclipseLinkProfiler.no_profiler.getPropertyValue(), EclipseLinkProfiler.performance_profiler.getPropertyValue(), EclipseLinkProfiler.query_monitor.getPropertyValue()};
 		String ECLIPSELINK_SESSION_PROFILER_CLASS_NAME = "org.eclipse.persistence.sessions.SessionProfiler"; //$NON-NLS-1$
-		
-	Boolean getDefaultValidationOnly();
+
 	Boolean getValidationOnly();
 	void setValidationOnly(Boolean newValidationOnly);
-		static final String VALIDATION_ONLY_PROPERTY = "validationOnly"; //$NON-NLS-1$
+		String VALIDATION_ONLY_PROPERTY = "validationOnly"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_VALIDATION_ONLY = "eclipselink.validation-only"; //$NON-NLS-1$
-		static final Boolean DEFAULT_VALIDATION_ONLY = Boolean.TRUE;
+		String ECLIPSELINK_VALIDATION_ONLY = "eclipselink.validation-only"; //$NON-NLS-1$
+	Boolean getDefaultValidationOnly();
+		String DEFAULT_VALIDATION_ONLY_PROPERTY = "defaultValidationOnly"; //$NON-NLS-1$
+		Boolean DEFAULT_VALIDATION_ONLY = Boolean.TRUE;
 
-	String getDefaultExceptionHandler();
 	String getExceptionHandler();
 	void setExceptionHandler(String newExceptionHandler);
-		static final String EXCEPTION_HANDLER_PROPERTY = "exceptionHandler"; //$NON-NLS-1$
+		String EXCEPTION_HANDLER_PROPERTY = "exceptionHandler"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_EXCEPTION_HANDLER = "eclipselink.exception-handler"; //$NON-NLS-1$
-		static final String DEFAULT_EXCEPTION_HANDLER = null;	// no default
+		String ECLIPSELINK_EXCEPTION_HANDLER = "eclipselink.exception-handler"; //$NON-NLS-1$
+	String getDefaultExceptionHandler();
+		String DEFAULT_EXCEPTION_HANDLER_PROPERTY = "defaultExceptionHandler"; //$NON-NLS-1$
+		String DEFAULT_EXCEPTION_HANDLER = null;	// no default
 		String ECLIPSELINK_EXCEPTION_HANDLER_CLASS_NAME = "org.eclipse.persistence.exceptions.ExceptionHandler"; //$NON-NLS-1$
 
-	Boolean getDefaultValidateSchema();
 	Boolean getValidateSchema();
 	void setValidateSchema(Boolean newValidateSchema);
-		static final String VALIDATE_SCHEMA_PROPERTY = "validateSchema"; //$NON-NLS-1$
+		String VALIDATE_SCHEMA_PROPERTY = "validateSchema"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_VALIDATE_SCHEMA = "eclipselink.orm.validate.schema"; //$NON-NLS-1$
-		static final Boolean DEFAULT_VALIDATE_SCHEMA = Boolean.FALSE;
+		String ECLIPSELINK_VALIDATE_SCHEMA = "eclipselink.orm.validate.schema"; //$NON-NLS-1$
+	Boolean getDefaultValidateSchema();
+		String DEFAULT_VALIDATE_SCHEMA_PROPERTY = "defaultValidateSchema"; //$NON-NLS-1$
+		Boolean DEFAULT_VALIDATE_SCHEMA = Boolean.FALSE;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkGeneralProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkGeneralProperties.java
index cddb45b5fa..6f323e2637 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkGeneralProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkGeneralProperties.java
@@ -9,10 +9,6 @@
 *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -21,31 +17,12 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkGeneralProperties
 	extends PersistenceUnitProperties
 {
-
-	Boolean getDefaultExcludeEclipselinkOrm();
-	Boolean getExcludeEclipselinkOrm();
-	void setExcludeEclipselinkOrm(Boolean newExcludeEclipselinkOrm);
-		static final String EXCLUDE_ECLIPSELINK_ORM_PROPERTY = "excludeEclipselinkOrm"; //$NON-NLS-1$
+	Boolean getExcludeEclipseLinkOrm();
+	void setExcludeEclipseLinkOrm(Boolean newExcludeEclipselinkOrm);
+		String EXCLUDE_ECLIPSELINK_ORM_PROPERTY = "excludeEclipselinkOrm"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM = "eclipselink.exclude-eclipselink-orm"; //$NON-NLS-1$
-		static final Boolean DEFAULT_EXCLUDE_ECLIPSELINK_ORM = Boolean.FALSE;
-		Transformer<EclipseLinkGeneralProperties, Boolean> EXCLUDE_ECLIPSELINK_ORM_TRANSFORMER = new ExcludeEclipselinkOrmTransformer();
-		class ExcludeEclipselinkOrmTransformer
-			extends TransformerAdapter<EclipseLinkGeneralProperties, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkGeneralProperties model) {
-				return model.getExcludeEclipselinkOrm();
-			}
-		}
-	
-		BiClosure<EclipseLinkGeneralProperties, Boolean> SET_EXCLUDE_ECLIPSELINK_ORM_CLOSURE = new SetExcludeEclipselinkOrmClosure();
-		class SetExcludeEclipselinkOrmClosure
-			extends BiClosureAdapter<EclipseLinkGeneralProperties, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkGeneralProperties model, Boolean value) {
-				model.setExcludeEclipselinkOrm(value);
-			}
-		}
+		String ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM = "eclipselink.exclude-eclipselink-orm"; //$NON-NLS-1$
+	Boolean getDefaultExcludeEclipseLinkOrm();
+		String DEFAULT_EXCLUDE_ECLIPSELINK_ORM_PROPERTY = "defaultExcludeEclipselinkOrm"; //$NON-NLS-1$
+		Boolean DEFAULT_EXCLUDE_ECLIPSELINK_ORM = Boolean.FALSE;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging.java
index ada0ca4e2e..a18cd8625e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging.java
@@ -9,10 +9,6 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -21,80 +17,68 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkLogging
 	extends PersistenceUnitProperties
 {
-	EclipseLinkLoggingLevel getDefaultLevel();
 	EclipseLinkLoggingLevel getLevel();
 	void setLevel(EclipseLinkLoggingLevel level);
 		String LEVEL_PROPERTY = "level"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_LEVEL = "eclipselink.logging.level"; //$NON-NLS-1$
+	EclipseLinkLoggingLevel getDefaultLevel();
+		String DEFAULT_LEVEL_PROPERTY = "defaultLevel"; //$NON-NLS-1$
 		EclipseLinkLoggingLevel DEFAULT_LEVEL = EclipseLinkLoggingLevel.info;
 	
-	Boolean getDefaultTimestamp();
 	Boolean getTimestamp();
 	void setTimestamp(Boolean timestamp);
 		String TIMESTAMP_PROPERTY = "timestamp"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_TIMESTAMP = "eclipselink.logging.timestamp"; //$NON-NLS-1$
+	Boolean getDefaultTimestamp();
+		String DEFAULT_TIMESTAMP_PROPERTY = "defaultTimestamp"; //$NON-NLS-1$
 		Boolean DEFAULT_TIMESTAMP = Boolean.TRUE;
-		Transformer<EclipseLinkLogging, Boolean> TIMESTAMP_TRANSFORMER = new TimestampTransformer();
-		class TimestampTransformer
-			extends TransformerAdapter<EclipseLinkLogging, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkLogging logging) {
-				return logging.getTimestamp();
-			}
-		}
 	
-		BiClosure<EclipseLinkLogging, Boolean> SET_TIMESTAMP_CLOSURE = new SetTimestampClosure();
-		class SetTimestampClosure
-			extends BiClosureAdapter<EclipseLinkLogging, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkLogging logging, Boolean timestamp) {
-				logging.setTimestamp(timestamp);
-			}
-		}
-	
-	Boolean getDefaultThread();
 	Boolean getThread();
 	void setThread(Boolean thread);
 		String THREAD_PROPERTY = "thread"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_THREAD = "eclipselink.logging.thread"; //$NON-NLS-1$
+	Boolean getDefaultThread();
+		String DEFAULT_THREAD_PROPERTY = "defaultThread"; //$NON-NLS-1$
 		Boolean DEFAULT_THREAD = Boolean.TRUE;
 	
-	Boolean getDefaultSession();
 	Boolean getSession();
 	void setSession(Boolean session);
 		String SESSION_PROPERTY = "session"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_SESSION = "eclipselink.logging.session"; //$NON-NLS-1$
+	Boolean getDefaultSession();
+		String DEFAULT_SESSION_PROPERTY = "defaultSession"; //$NON-NLS-1$
 		Boolean DEFAULT_SESSION = Boolean.TRUE;
 	
-	Boolean getDefaultExceptions();
 	Boolean getExceptions();
 	void setExceptions(Boolean exceptions);
 		String EXCEPTIONS_PROPERTY = "exceptions"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_EXCEPTIONS = "eclipselink.logging.exceptions"; //$NON-NLS-1$
+	Boolean getDefaultExceptions();
+		String DEFAULT_EXCEPTIONS_PROPERTY = "defaultExceptions"; //$NON-NLS-1$
 		Boolean DEFAULT_EXCEPTIONS = Boolean.FALSE;
 		
-	String getDefaultLogFileLocation();
 	String getLogFileLocation();
 	void setLogFileLocation(String newLogFileLocation);
 		String LOG_FILE_LOCATION_PROPERTY = "logFileLocation"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_LOG_FILE_LOCATION = "eclipselink.logging.file"; //$NON-NLS-1$
+	String getDefaultLogFileLocation();
+		String DEFAULT_LOG_FILE_LOCATION_PROPERTY = "defaultLogFileLocation"; //$NON-NLS-1$
 		String DEFAULT_LOG_FILE_LOCATION = null;		// No Default
 		
-	String getDefaultLogger();
 	String getLogger();
 	void setLogger(String newLogger);
 	void setLogger(EclipseLinkLogger newLogger);
 		String LOGGER_PROPERTY = "logger"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_LOGGER = "eclipselink.logging.logger"; //$NON-NLS-1$
+	String getDefaultLogger();
+		String DEFAULT_LOGGER_PROPERTY = "defaultLogger"; //$NON-NLS-1$
 		String DEFAULT_LOGGER = EclipseLinkLogger.default_logger.getPropertyValue();
 		String[] RESERVED_LOGGER_NAMES = {EclipseLinkLogger.default_logger.getPropertyValue(), EclipseLinkLogger.java_logger.getPropertyValue(), EclipseLinkLogger.server_logger.getPropertyValue()};
 		String ECLIPSELINK_LOGGER_CLASS_NAME = "org.eclipse.persistence.logging.SessionLog"; //$NON-NLS-1$
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_0.java
index 846c44e439..d329d1c855 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_0.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -15,65 +15,65 @@ package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 public interface EclipseLinkLogging2_0
 	extends EclipseLinkLogging
 {
-	public static final String CATEGORY_PREFIX_ = "eclipselink.logging.level."; //$NON-NLS-1$
+	public String CATEGORY_PREFIX_ = "eclipselink.logging.level."; //$NON-NLS-1$
 
-	Boolean getDefaultConnection();
 	Boolean getConnection();
 	void setConnection(Boolean connection);
-		static final String CONNECTION_PROPERTY = "connection"; //$NON-NLS-1$
+		String CONNECTION_PROPERTY = "connection"; //$NON-NLS-1$
 		// EclipseLink key string
-		static final String ECLIPSELINK_CONNECTION = "eclipselink.logging.connection"; //$NON-NLS-1$
-		static final Boolean DEFAULT_CONNECTION = Boolean.TRUE;
+		String ECLIPSELINK_CONNECTION = "eclipselink.logging.connection"; //$NON-NLS-1$
+	Boolean getDefaultConnection();
+		String DEFAULT_CONNECTION_PROPERTY = "defaultConnection"; //$NON-NLS-1$
+		Boolean DEFAULT_CONNECTION = Boolean.TRUE;
 		
-	EclipseLinkLoggingLevel getCategoriesDefaultLevel();
 	EclipseLinkLoggingLevel getLevel(String category);
 	void setLevel(String category, EclipseLinkLoggingLevel level);
+	EclipseLinkLoggingLevel getCategoriesDefaultLevel();
 	void setDefaultLevel(EclipseLinkLoggingLevel level);
-	static final String CATEGORIES_DEFAULT_LOGGING_PROPERTY = "categoriesDefaultLoggingLevel"; //$NON-NLS-1$
+	String CATEGORIES_DEFAULT_LOGGING_PROPERTY = "categoriesDefaultLoggingLevel"; //$NON-NLS-1$
 
-		static final String SQL_CATEGORY_LOGGING_PROPERTY = "sqlLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sql"; //$NON-NLS-1$
+		String SQL_CATEGORY_LOGGING_PROPERTY = "sqlLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_SQL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sql"; //$NON-NLS-1$
 	
-		static final String TRANSACTION_CATEGORY_LOGGING_PROPERTY = "transactionLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "transaction"; //$NON-NLS-1$
+		String TRANSACTION_CATEGORY_LOGGING_PROPERTY = "transactionLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_TRANSACTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "transaction"; //$NON-NLS-1$
 	
-		static final String EVENT_CATEGORY_LOGGING_PROPERTY = "eventLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "event"; //$NON-NLS-1$
+		String EVENT_CATEGORY_LOGGING_PROPERTY = "eventLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_EVENT_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "event"; //$NON-NLS-1$
 	
-		static final String CONNECTION_CATEGORY_LOGGING_PROPERTY = "connectionLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "connection"; //$NON-NLS-1$
+		String CONNECTION_CATEGORY_LOGGING_PROPERTY = "connectionLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_CONNECTION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "connection"; //$NON-NLS-1$
 	
-		static final String QUERY_CATEGORY_LOGGING_PROPERTY = "queryLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "query"; //$NON-NLS-1$
+		String QUERY_CATEGORY_LOGGING_PROPERTY = "queryLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_QUERY_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "query"; //$NON-NLS-1$
 	
-		static final String CACHE_CATEGORY_LOGGING_PROPERTY = "cacheLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "cache"; //$NON-NLS-1$
+		String CACHE_CATEGORY_LOGGING_PROPERTY = "cacheLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_CACHE_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "cache"; //$NON-NLS-1$
 	
-		static final String PROPAGATION_CATEGORY_LOGGING_PROPERTY = "propagationLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "propagation"; //$NON-NLS-1$
+		String PROPAGATION_CATEGORY_LOGGING_PROPERTY = "propagationLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_PROPAGATION_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "propagation"; //$NON-NLS-1$
 	
-		static final String SEQUENCING_CATEGORY_LOGGING_PROPERTY = "sequencingLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sequencing"; //$NON-NLS-1$
+		String SEQUENCING_CATEGORY_LOGGING_PROPERTY = "sequencingLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_SEQUENCING_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "sequencing"; //$NON-NLS-1$
 	
-		static final String EJB_CATEGORY_LOGGING_PROPERTY = "ejbLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb"; //$NON-NLS-1$
+		String EJB_CATEGORY_LOGGING_PROPERTY = "ejbLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_EJB_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb"; //$NON-NLS-1$
 	
-		static final String DMS_CATEGORY_LOGGING_PROPERTY = "dmsLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "dms"; //$NON-NLS-1$
+		String DMS_CATEGORY_LOGGING_PROPERTY = "dmsLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_DMS_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "dms"; //$NON-NLS-1$
 	
-		static final String EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY = "ejb_or_metadataLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb_or_metadata"; //$NON-NLS-1$
+		String EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY = "ejb_or_metadataLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_EJB_OR_METADATA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ejb_or_metadata"; //$NON-NLS-1$
 	
-		static final String JPA_METAMODEL_CATEGORY_LOGGING_PROPERTY = "jpa_metamodelLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_JPA_METAMODEL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "jpa_metamodel"; //$NON-NLS-1$
-
-		static final String WEAVER_CATEGORY_LOGGING_PROPERTY = "weaverLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "weaver"; //$NON-NLS-1$
+		String JPA_METAMODEL_CATEGORY_LOGGING_PROPERTY = "jpa_metamodelLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_JPA_METAMODEL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "jpa_metamodel"; //$NON-NLS-1$
 
-		static final String PROPERTIES_CATEGORY_LOGGING_PROPERTY = "propertiesLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "properties"; //$NON-NLS-1$
+		String WEAVER_CATEGORY_LOGGING_PROPERTY = "weaverLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_WEAVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "weaver"; //$NON-NLS-1$
 
-		static final String SERVER_CATEGORY_LOGGING_PROPERTY = "serverLoggingLevel"; //$NON-NLS-1$
-		static final String ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "server"; //$NON-NLS-1$
+		String PROPERTIES_CATEGORY_LOGGING_PROPERTY = "propertiesLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_PROPERTIES_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "properties"; //$NON-NLS-1$
 
+		String SERVER_CATEGORY_LOGGING_PROPERTY = "serverLoggingLevel"; //$NON-NLS-1$
+		String ECLIPSELINK_SERVER_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "server"; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_4.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_4.java
index e8ce59c088..6e86916e08 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_4.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkLogging2_4.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -15,15 +15,15 @@ package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 public interface EclipseLinkLogging2_4
 	extends EclipseLinkLogging2_0
 {
-	static final String METADATA_CATEGORY_LOGGING_PROPERTY = "metadataLoggingLevel"; //$NON-NLS-1$
-	static final String ECLIPSELINK_METADATA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "metadata"; //$NON-NLS-1$
+	String METADATA_CATEGORY_LOGGING_PROPERTY = "metadataLoggingLevel"; //$NON-NLS-1$
+	String ECLIPSELINK_METADATA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "metadata"; //$NON-NLS-1$
 
-	static final String METAMODEL_CATEGORY_LOGGING_PROPERTY = "metamodelLoggingLevel"; //$NON-NLS-1$
-	static final String ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "metamodel"; //$NON-NLS-1$
+	String METAMODEL_CATEGORY_LOGGING_PROPERTY = "metamodelLoggingLevel"; //$NON-NLS-1$
+	String ECLIPSELINK_METAMODEL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "metamodel"; //$NON-NLS-1$
 
-	static final String JPA_CATEGORY_LOGGING_PROPERTY = "jpaLoggingLevel"; //$NON-NLS-1$
-	final String ECLIPSELINK_JPA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "jpa"; //$NON-NLS-1$
+	String JPA_CATEGORY_LOGGING_PROPERTY = "jpaLoggingLevel"; //$NON-NLS-1$
+	String ECLIPSELINK_JPA_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "jpa"; //$NON-NLS-1$
 
-	static final String DDL_CATEGORY_LOGGING_PROPERTY = "ddlLoggingLevel"; //$NON-NLS-1$
-	final String ECLIPSELINK_DDL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ddl"; //$NON-NLS-1$
+	String DDL_CATEGORY_LOGGING_PROPERTY = "ddlLoggingLevel"; //$NON-NLS-1$
+	String ECLIPSELINK_DDL_CATEGORY_LOGGING_LEVEL = CATEGORY_PREFIX_ + "ddl"; //$NON-NLS-1$
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkOptions.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkOptions.java
index b7fc8e5a23..08ce732e09 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkOptions.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkOptions.java
@@ -9,10 +9,6 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -21,82 +17,69 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkOptions
 	extends PersistenceUnitProperties
 {
-	String getDefaultSessionName();
 	String getSessionName();
 	void setSessionName(String newSessionName); 
 		String SESSION_NAME_PROPERTY = "sessionName"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_SESSION_NAME = "eclipselink.session-name"; //$NON-NLS-1$
+	String getDefaultSessionName();
+		String DEFAULT_SESSION_NAME_PROPERTY = "defaultSessionName"; //$NON-NLS-1$
 		String DEFAULT_SESSION_NAME = "";	// no default //$NON-NLS-1$
 
-	String getDefaultSessionsXml();
 	String getSessionsXml();
 	void setSessionsXml(String newSessionsXml);
 		String SESSIONS_XML_PROPERTY = "sessionsXml"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_SESSIONS_XML = "eclipselink.sessions-xml"; //$NON-NLS-1$
+	String getDefaultSessionsXml();
+		String DEFAULT_SESSIONS_XML_PROPERTY = "defaultSessionsXml"; //$NON-NLS-1$
 		String DEFAULT_SESSIONS_XML = "";	// no default //$NON-NLS-1$
 		
-	Boolean getDefaultIncludeDescriptorQueries();
 	Boolean getIncludeDescriptorQueries();
 	void setIncludeDescriptorQueries(Boolean newIncludeDescriptorQueries);
 		String INCLUDE_DESCRIPTOR_QUERIES_PROPERTY = "includeDescriptorQueries"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_SESSION_INCLUDE_DESCRIPTOR_QUERIES = "eclipselink.session.include.descriptor.queries"; //$NON-NLS-1$
+	Boolean getDefaultIncludeDescriptorQueries();
+		String DEFAULT_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY = "defaultIncludeDescriptorQueries"; //$NON-NLS-1$
 		Boolean DEFAULT_SESSION_INCLUDE_DESCRIPTOR_QUERIES = Boolean.TRUE;
-		Transformer<EclipseLinkOptions, Boolean> INCLUDE_DESCRIPTOR_QUERIES_TRANSFORMER = new IncludeDescriptorQueriesTransformer();
-		class IncludeDescriptorQueriesTransformer
-			extends TransformerAdapter<EclipseLinkOptions, Boolean>
-		{
-			@Override
-			public Boolean transform(EclipseLinkOptions options) {
-				return options.getIncludeDescriptorQueries();
-			}
-		}
-	
-		BiClosure<EclipseLinkOptions, Boolean> SET_INCLUDE_DESCRIPTOR_QUERIES_CLOSURE = new SetIncludeDescriptorQueriesClosure();
-		class SetIncludeDescriptorQueriesClosure
-			extends BiClosureAdapter<EclipseLinkOptions, Boolean>
-		{
-			@Override
-			public void execute(EclipseLinkOptions logging, Boolean value) {
-				logging.setIncludeDescriptorQueries(value);
-			}
-		}
 		
-	String getDefaultTargetDatabase();
 	String getTargetDatabase();
 	void setTargetDatabase(String newTargetDatabase);
 	void setTargetDatabase(EclipseLinkTargetDatabase newTargetDatabase);
 		String TARGET_DATABASE_PROPERTY = "targetDatabase"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_TARGET_DATABASE = "eclipselink.target-database"; //$NON-NLS-1$
+	String getDefaultTargetDatabase();
+		String DEFAULT_TARGET_DATABASE_PROPERTY = "defaultTargetDatabase"; //$NON-NLS-1$
 		String DEFAULT_TARGET_DATABASE = EclipseLinkTargetDatabase.auto.getPropertyValue();
 
-	String getDefaultTargetServer();
 	String getTargetServer();
 	void setTargetServer(String newTargetServer);
 	void setTargetServer(EclipseLinkTargetServer newTargetServer);
 		String TARGET_SERVER_PROPERTY = "targetServer"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_TARGET_SERVER = "eclipselink.target-server"; //$NON-NLS-1$
+	String getDefaultTargetServer();
+		String DEFAULT_TARGET_SERVER_PROPERTY = "defaultTargetServer"; //$NON-NLS-1$
 		String DEFAULT_TARGET_SERVER = EclipseLinkTargetServer.none.getPropertyValue();
 
-	String getDefaultEventListener();
 	String getEventListener();
 	void setEventListener(String newEventListener);
 		String SESSION_EVENT_LISTENER_PROPERTY = "eventListener"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_SESSION_EVENT_LISTENER = "eclipselink.session-event-listener"; //$NON-NLS-1$
-		String DEFAULT_SESSION_EVENT_LISTENER = null;	// no default
 		String ECLIPSELINK_EVENT_LISTENER_CLASS_NAME = "org.eclipse.persistence.sessions.SessionEventListener"; //$NON-NLS-1$
+	String getDefaultEventListener();
+		String DEFAULT_SESSION_EVENT_LISTENER_PROPERTY = "defaultEventListener"; //$NON-NLS-1$
+		String DEFAULT_SESSION_EVENT_LISTENER = null;	// no default
 
-	Boolean getDefaultTemporalMutable();
 	Boolean getTemporalMutable();
 	void setTemporalMutable(Boolean temporalMutable);
 		String TEMPORAL_MUTABLE_PROPERTY = "temporalMutable"; //$NON-NLS-1$
 		// EclipseLink key string
 		String ECLIPSELINK_TEMPORAL_MUTABLE = "eclipselink.temporal.mutable"; //$NON-NLS-1$
+	Boolean getDefaultTemporalMutable();
+		String DEFAULT_TEMPORAL_MUTABLE_PROPERTY = "defaultTemporalMutable"; //$NON-NLS-1$
 		Boolean DEFAULT_TEMPORAL_MUTABLE = Boolean.FALSE;
-	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
index 87c16b64b9..4f7d3df723 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
@@ -434,7 +434,7 @@ public class EclipseLinkPersistenceUnit
 	}
 
 	protected boolean impliedEclipseLinkMappingFileIsExcluded() {
-		return this.getGeneralProperties().getExcludeEclipselinkOrm() == Boolean.TRUE;
+		return this.getGeneralProperties().getExcludeEclipseLinkOrm() == Boolean.TRUE;
 	}
 
 	protected boolean impliedEclipseLinkMappingFileIsNotSpecified() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkSchemaGeneration.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkSchemaGeneration.java
index dc77fd61f3..3023c8763c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkSchemaGeneration.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkSchemaGeneration.java
@@ -9,10 +9,6 @@
  *******************************************************************************/
 package org.eclipse.jpt.jpa.eclipselink.core.context.persistence;
 
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 
 /**
@@ -22,81 +18,43 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties;
 public interface EclipseLinkSchemaGeneration
 	extends PersistenceUnitProperties
 {
-	EclipseLinkDdlGenerationType getDefaultDdlGenerationType();
 	EclipseLinkDdlGenerationType getDdlGenerationType();
 	void setDdlGenerationType(EclipseLinkDdlGenerationType ddlGenerationType);
 		String DDL_GENERATION_TYPE_PROPERTY = "ddlGenerationType";
 		// EclipseLink key string
 		String ECLIPSELINK_DDL_GENERATION_TYPE = "eclipselink.ddl-generation";
-		EclipseLinkDdlGenerationType DEFAULT_SCHEMA_GENERATION_DDL_GENERATION_TYPE = EclipseLinkDdlGenerationType.none;
-		Transformer<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType> DDL_GENERATION_TYPE_TRANSFORMER = new DdlGenerationTypeTransformer();
-		class DdlGenerationTypeTransformer
-			extends TransformerAdapter<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType>
-		{
-			@Override
-			public EclipseLinkDdlGenerationType transform(EclipseLinkSchemaGeneration logging) {
-				return logging.getDdlGenerationType();
-			}
-		}
-	
-		BiClosure<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType> SET_DDL_GENERATION_TYPE_CLOSURE = new SetDdlGenerationTypeClosure();
-		class SetDdlGenerationTypeClosure
-			extends BiClosureAdapter<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType>
-		{
-			@Override
-			public void execute(EclipseLinkSchemaGeneration logging, EclipseLinkDdlGenerationType timestamp) {
-				logging.setDdlGenerationType(timestamp);
-			}
-		}
+	EclipseLinkDdlGenerationType getDefaultDdlGenerationType();
+		EclipseLinkDdlGenerationType DEFAULT_DDL_GENERATION_TYPE = EclipseLinkDdlGenerationType.none;
 
-	EclipseLinkOutputMode getDefaultOutputMode();
 	EclipseLinkOutputMode getOutputMode();
 	void setOutputMode(EclipseLinkOutputMode outputMode); // put
 		String OUTPUT_MODE_PROPERTY = "outputMode";
 		// EclipseLink key string
 		String ECLIPSELINK_DDL_GENERATION_OUTPUT_MODE = "eclipselink.ddl-generation.output-mode";
-		EclipseLinkOutputMode DEFAULT_SCHEMA_GENERATION_OUTPUT_MODE = null;		// No Default
-		Transformer<EclipseLinkSchemaGeneration, EclipseLinkOutputMode> OUTPUT_MODE_TRANSFORMER = new OutputModeTransformer();
-		class OutputModeTransformer
-			extends TransformerAdapter<EclipseLinkSchemaGeneration, EclipseLinkOutputMode>
-		{
-			@Override
-			public EclipseLinkOutputMode transform(EclipseLinkSchemaGeneration logging) {
-				return logging.getOutputMode();
-			}
-		}
-	
-		BiClosure<EclipseLinkSchemaGeneration, EclipseLinkOutputMode> SET_OUTPUT_MODE_CLOSURE = new SetOutputModeClosure();
-		class SetOutputModeClosure
-			extends BiClosureAdapter<EclipseLinkSchemaGeneration, EclipseLinkOutputMode>
-		{
-			@Override
-			public void execute(EclipseLinkSchemaGeneration logging, EclipseLinkOutputMode mode) {
-				logging.setOutputMode(mode);
-			}
-		}
+	EclipseLinkOutputMode getDefaultOutputMode();
+		EclipseLinkOutputMode DEFAULT_OUTPUT_MODE = null;		// No Default
 
-	String getDefaultCreateFileName();
 	String getCreateFileName();
 	void setCreateFileName(String createFileName);
 		String CREATE_FILE_NAME_PROPERTY = "createFileName";
 		// EclipseLink key string
 		String ECLIPSELINK_CREATE_FILE_NAME = "eclipselink.create-ddl-jdbc-file-name";
-		String DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME = "createDDL.sql";
+	String getDefaultCreateFileName();
+		String DEFAULT_CREATE_FILE_NAME = "createDDL.sql";
 	
-	String getDefaultDropFileName();
 	String getDropFileName();
 	void setDropFileName(String dropFileName);
 		String DROP_FILE_NAME_PROPERTY = "dropFileName";
 		// EclipseLink key string
 		String ECLIPSELINK_DROP_FILE_NAME = "eclipselink.drop-ddl-jdbc-file-name";
-		String DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME = "dropDDL.sql";
+	String getDefaultDropFileName();
+		String DEFAULT_DROP_FILE_NAME = "dropDDL.sql";
 		
-	String getDefaultApplicationLocation();
 	String getApplicationLocation();
 	void setApplicationLocation(String applicationLocation);
 		String APPLICATION_LOCATION_PROPERTY = "applicationLocation";
 		// EclipseLink key string
 		String ECLIPSELINK_APPLICATION_LOCATION = "eclipselink.application-location";
-		String DEFAULT_SCHEMA_GENERATION_APPLICATION_LOCATION = null;
+	String getDefaultApplicationLocation();
+		String DEFAULT_APPLICATION_LOCATION = null;
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
index afbc94b134..1f6dc2463f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -117,10 +117,10 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 	// ********** multitenant **********
 
 	public boolean isMultitenant() {
-		return this.isSpecifiedMultitenant() || this.isDefaultMultitenant();
+		return this.getSpecifiedMultitenant() || this.getDefaultMultitenant();
 	}
 
-	public boolean isDefaultMultitenant() {
+	public boolean getDefaultMultitenant() {
 		return this.defaultMultitenant;
 	}
 
@@ -134,7 +134,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 		return this.isMultitenantInheritanceHierarchy() || this.isSuperMappedSuperclassMultitenant();
 	}
 
-	public boolean isSpecifiedMultitenant() {
+	public boolean getSpecifiedMultitenant() {
 		return this.specifiedMultitenant;
 	}
 
@@ -200,7 +200,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 		if (!isMultitenant()) {
 			return null;
 		}
-		if (isSpecifiedMultitenant()) {
+		if (getSpecifiedMultitenant()) {
 			return DEFAULT_TYPE;
 		}
 		if (this.isMultitenantInheritanceHierarchy()) {
@@ -214,7 +214,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 	// ********** include criteria **********
 
 	public boolean isIncludeCriteria() {
-		return (this.specifiedIncludeCriteria != null) ? this.specifiedIncludeCriteria.booleanValue() : this.isDefaultIncludeCriteria();
+		return (this.specifiedIncludeCriteria != null) ? this.specifiedIncludeCriteria.booleanValue() : this.getDefaultIncludeCriteria();
 	}
 
 	public Boolean getSpecifiedIncludeCriteria() {
@@ -232,7 +232,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 		this.firePropertyChanged(SPECIFIED_INCLUDE_CRITERIA_PROPERTY, old, includeCriteria);
 	}
 
-	public boolean isDefaultIncludeCriteria() {
+	public boolean getDefaultIncludeCriteria() {
 		return this.defaultIncludeCriteria;
 	}
 
@@ -382,7 +382,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
 		if (this.isMultitenantInheritanceHierarchy()) {
 			return new SuperListIterableWrapper<EclipseLinkTenantDiscriminatorColumn2_3>(this.getRootEntity().getMultitenancy().getTenantDiscriminatorColumns());
 		}
-		if (!this.isSpecifiedMultitenant()) {
+		if (!this.getSpecifiedMultitenant()) {
 			EclipseLinkMappedSuperclass superMappedSuperclass = this.getSuperMappedSuperclass();
 			if (superMappedSuperclass != null && superMappedSuperclass.getMultitenancy().isMultitenant()) {
 				return new SuperListIterableWrapper<EclipseLinkTenantDiscriminatorColumn2_3>(superMappedSuperclass.getMultitenancy().getTenantDiscriminatorColumns());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
index fae7ca70ed..db00797ca9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -100,7 +100,7 @@ public class EclipseLinkJavaMutable
 		return (annotationValue == null) ? Boolean.TRUE : annotationValue;
 	}
 
-	public boolean isDefaultMutable() {
+	public boolean getDefaultMutable() {
 		return this.defaultMutable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
index 8abda9fab4..78564e4583 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -44,7 +44,7 @@ public class EclipseLinkJavaReadOnly
 	// ********** read-only **********
 
 	public boolean isReadOnly() {
-		return (this.specifiedReadOnly != null) ? this.specifiedReadOnly.booleanValue() : this.isDefaultReadOnly();
+		return (this.specifiedReadOnly != null) ? this.specifiedReadOnly.booleanValue() : this.getDefaultReadOnly();
 	}
 
 	public Boolean getSpecifiedReadOnly() {
@@ -79,7 +79,7 @@ public class EclipseLinkJavaReadOnly
 		return (this.getReadOnlyAnnotation() == null) ? null : Boolean.TRUE;
 	}
 
-	public boolean isDefaultReadOnly() {
+	public boolean getDefaultReadOnly() {
 		return DEFAULT_READ_ONLY;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
index 512bc449d5..2949229816 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -181,7 +181,7 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3
 	// ********** primaryKey **********
 
 	public boolean isPrimaryKey() {
-		return (this.specifiedPrimaryKey != null) ? this.specifiedPrimaryKey.booleanValue() : this.isDefaultPrimaryKey();
+		return (this.specifiedPrimaryKey != null) ? this.specifiedPrimaryKey.booleanValue() : this.getDefaultPrimaryKey();
 	}
 
 	public Boolean getSpecifiedPrimaryKey() {
@@ -206,7 +206,7 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3
 		return this.getColumnAnnotation().getPrimaryKey();
 	}
 
-	public boolean isDefaultPrimaryKey() {
+	public boolean getDefaultPrimaryKey() {
 		return this.defaultPrimaryKey;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java
index 09765a3e4f..6108585c0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -155,7 +155,7 @@ public class EclipseLinkJavaVirtualTenantDiscriminatorColumn2_3
 		return this.getOverriddenColumn().getSpecifiedPrimaryKey();
 	}
 
-	public boolean isDefaultPrimaryKey() {
+	public boolean getDefaultPrimaryKey() {
 		return this.defaultPrimaryKey;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkNullJavaMultitenancy2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkNullJavaMultitenancy2_3.java
index 4c98e7b3bb..dcab3baf42 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkNullJavaMultitenancy2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkNullJavaMultitenancy2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -36,11 +36,11 @@ public class EclipseLinkNullJavaMultitenancy2_3
 		return false;
 	}
 
-	public boolean isDefaultMultitenant() {
+	public boolean getDefaultMultitenant() {
 		return false;
 	}
 
-	public boolean isSpecifiedMultitenant() {
+	public boolean getSpecifiedMultitenant() {
 		return false;
 	}
 
@@ -79,7 +79,7 @@ public class EclipseLinkNullJavaMultitenancy2_3
 		throw new UnsupportedOperationException("Multitenancy is only supported in EclipseLink version 2.3 and higher"); //$NON-NLS-1$
 	}
 
-	public boolean isDefaultIncludeCriteria() {
+	public boolean getDefaultIncludeCriteria() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkNullOrmMultitenancy2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkNullOrmMultitenancy2_3.java
index 175e614a0a..ac19af3451 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkNullOrmMultitenancy2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkNullOrmMultitenancy2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -37,11 +37,11 @@ public class EclipseLinkNullOrmMultitenancy2_3
 		return false;
 	}
 
-	public boolean isDefaultMultitenant() {
+	public boolean getDefaultMultitenant() {
 		return false;
 	}
 
-	public boolean isSpecifiedMultitenant() {
+	public boolean getSpecifiedMultitenant() {
 		return false;
 	}
 
@@ -83,7 +83,7 @@ public class EclipseLinkNullOrmMultitenancy2_3
 		throw new UnsupportedOperationException("Multitenancy is only supported in EclipseLink version 2.3 and higher"); //$NON-NLS-1$
 	}
 
-	public boolean isDefaultIncludeCriteria() {
+	public boolean getDefaultIncludeCriteria() {
 		return false;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
index ba703df21e..d0a7b379f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -123,10 +123,10 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 	// ********** multitenant **********
 
 	public boolean isMultitenant() {
-		return isSpecifiedMultitenant() || isDefaultMultitenant();
+		return getSpecifiedMultitenant() || getDefaultMultitenant();
 	}
 
-	public boolean isDefaultMultitenant() {
+	public boolean getDefaultMultitenant() {
 		return this.defaultMultitenant;
 	}
 
@@ -140,7 +140,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 		return this.isMultitenantInheritanceHierarchy() || this.isSuperMappedSuperclassMultitenant();
 	}
 
-	public boolean isSpecifiedMultitenant() {
+	public boolean getSpecifiedMultitenant() {
 		return this.specifiedMultitenant;
 	}
 
@@ -214,7 +214,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 		if (!isMultitenant()) {
 			return null;
 		}
-		if (isSpecifiedMultitenant()) {
+		if (getSpecifiedMultitenant()) {
 			return DEFAULT_TYPE;
 		}
 		if (this.isMultitenantInheritanceHierarchy()) {
@@ -255,7 +255,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 	}
 
 
-	public boolean isDefaultIncludeCriteria() {
+	public boolean getDefaultIncludeCriteria() {
 		return this.defaultIncludeCriteria;
 	}
 
@@ -411,7 +411,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 			return EmptyListIterable.instance();
 		}
 		EclipseLinkJavaMultitenancy2_3 javaMultitenancy = this.getJavaMultitenancyPolicyForDefaults();
-		if (javaMultitenancy != null && !this.isSpecifiedMultitenant()) {
+		if (javaMultitenancy != null && !this.getSpecifiedMultitenant()) {
 			if (javaMultitenancy.hasSpecifiedTenantDiscriminatorColumns()) {
 				return new SuperListIterableWrapper<EclipseLinkTenantDiscriminatorColumn2_3>(javaMultitenancy.getSpecifiedTenantDiscriminatorColumns());
 			}
@@ -419,7 +419,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
 		if (this.isMultitenantInheritanceHierarchy()) {
 			return new SuperListIterableWrapper<EclipseLinkTenantDiscriminatorColumn2_3>(this.getRootEntity().getMultitenancy().getTenantDiscriminatorColumns());
 		}
-		if (!isSpecifiedMultitenant()) {
+		if (!getSpecifiedMultitenant()) {
 			EclipseLinkMappedSuperclass superMappedSuperclass = this.getSuperMappedSuperclass();
 			if (superMappedSuperclass != null && superMappedSuperclass.getMultitenancy().isMultitenant()) {
 				return new SuperListIterableWrapper<EclipseLinkTenantDiscriminatorColumn2_3>(superMappedSuperclass.getMultitenancy().getTenantDiscriminatorColumns());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
index 923b37b517..060d723eab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -72,7 +72,7 @@ public class EclipseLinkOrmMutable
 		return this.getXmlMutable().getMutable();
 	}
 
-	public boolean isDefaultMutable() {
+	public boolean getDefaultMutable() {
 		return this.defaultMutable;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
index 021104cc81..9dca969310 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -72,7 +72,7 @@ public class EclipseLinkOrmReadOnly
 		return this.getXmlReadOnly().getReadOnly();
 	}
 
-	public boolean isDefaultReadOnly() {
+	public boolean getDefaultReadOnly() {
 		return this.defaultReadOnly;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
index aa1314e79e..025d527f70 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the terms of
  * the Eclipse Public License v1.0, which accompanies this distribution and is available at
  * http://www.eclipse.org/legal/epl-v10.html.
@@ -185,7 +185,7 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3
 	// ********** primaryKey **********
 
 	public boolean isPrimaryKey() {
-		return (this.specifiedPrimaryKey != null) ? this.specifiedPrimaryKey.booleanValue() : this.isDefaultPrimaryKey();
+		return (this.specifiedPrimaryKey != null) ? this.specifiedPrimaryKey.booleanValue() : this.getDefaultPrimaryKey();
 	}
 
 	public Boolean getSpecifiedPrimaryKey() {
@@ -209,7 +209,7 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3
 		return (this.xmlTenantDiscriminatorColumn == null) ? null : this.xmlTenantDiscriminatorColumn.getPrimaryKey();
 	}
 
-	public boolean isDefaultPrimaryKey() {
+	public boolean getDefaultPrimaryKey() {
 		return this.defaultPrimaryKey;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVirtualTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVirtualTenantDiscriminatorColumn2_3.java
index 8196c6a2ea..f67dfd6775 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVirtualTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVirtualTenantDiscriminatorColumn2_3.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -154,7 +154,7 @@ public class EclipseLinkOrmVirtualTenantDiscriminatorColumn2_3
 		return this.getOverriddenColumn().getSpecifiedPrimaryKey();
 	}
 
-	public boolean isDefaultPrimaryKey() {
+	public boolean getDefaultPrimaryKey() {
 		return this.defaultPrimaryKey;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkGeneralProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkGeneralProperties.java
index b0a581c1d5..882b6f15bd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkGeneralProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkGeneralProperties.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
+* Copyright (c) 2008, 2016 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -69,11 +69,11 @@ public class EclipseLinkGeneralProperties
 
 	
 	// ********** ExcludeEclipselinkOrm **********
-	public Boolean getExcludeEclipselinkOrm() {
+	public Boolean getExcludeEclipseLinkOrm() {
 		return this.excludeEclipselinkOrm;
 	}
 
-	public void setExcludeEclipselinkOrm(Boolean newExcludeEclipselinkOrm) {
+	public void setExcludeEclipseLinkOrm(Boolean newExcludeEclipselinkOrm) {
 		Boolean old = this.excludeEclipselinkOrm;
 		this.excludeEclipselinkOrm = newExcludeEclipselinkOrm;
 		this.putProperty(EXCLUDE_ECLIPSELINK_ORM_PROPERTY, newExcludeEclipselinkOrm);
@@ -88,7 +88,7 @@ public class EclipseLinkGeneralProperties
 		this.firePropertyChanged(EXCLUDE_ECLIPSELINK_ORM_PROPERTY, old, newValue);
 	}
 
-	public Boolean getDefaultExcludeEclipselinkOrm() {
+	public Boolean getDefaultExcludeEclipseLinkOrm() {
 		return DEFAULT_EXCLUDE_ECLIPSELINK_ORM;
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkSchemaGenerationImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkSchemaGenerationImpl.java
index e0ad591f07..7b09e2bc1a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkSchemaGenerationImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkSchemaGenerationImpl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -132,7 +132,7 @@ public class EclipseLinkSchemaGenerationImpl
 	}
 
 	public EclipseLinkDdlGenerationType getDefaultDdlGenerationType() {
-		return DEFAULT_SCHEMA_GENERATION_DDL_GENERATION_TYPE;
+		return DEFAULT_DDL_GENERATION_TYPE;
 	}
 
 	// ********** OutputMode **********
@@ -155,7 +155,7 @@ public class EclipseLinkSchemaGenerationImpl
 	}
 
 	public EclipseLinkOutputMode getDefaultOutputMode() {
-		return DEFAULT_SCHEMA_GENERATION_OUTPUT_MODE;
+		return DEFAULT_OUTPUT_MODE;
 	}
 
 	// ********** CreateFileName **********
@@ -177,7 +177,7 @@ public class EclipseLinkSchemaGenerationImpl
 	}
 
 	public String getDefaultCreateFileName() {
-		return DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME;
+		return DEFAULT_CREATE_FILE_NAME;
 	}
 
 	// ********** dropFileName **********
@@ -199,7 +199,7 @@ public class EclipseLinkSchemaGenerationImpl
 	}
 
 	public String getDefaultDropFileName() {
-		return DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME;
+		return DEFAULT_DROP_FILE_NAME;
 	}
 
 	// ********** applicationLocation **********
@@ -223,6 +223,6 @@ public class EclipseLinkSchemaGenerationImpl
 	}
 
 	public String getDefaultApplicationLocation() {
-		return DEFAULT_SCHEMA_GENERATION_APPLICATION_LOCATION;
+		return DEFAULT_APPLICATION_LOCATION;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkAbstractDDLGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkAbstractDDLGenerator.java
index f68fe764f5..d4667fd602 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkAbstractDDLGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/ddlgen/EclipseLinkAbstractDDLGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -272,10 +272,10 @@ public abstract class EclipseLinkAbstractDDLGenerator extends AbstractJptGenerat
 
 		this.putProperty(properties,  
 			EclipseLinkSchemaGeneration.ECLIPSELINK_CREATE_FILE_NAME,
-			EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME);
+			EclipseLinkSchemaGeneration.DEFAULT_CREATE_FILE_NAME);
 		this.putProperty(properties,  
 			EclipseLinkSchemaGeneration.ECLIPSELINK_DROP_FILE_NAME,
-			EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME);
+			EclipseLinkSchemaGeneration.DEFAULT_DROP_FILE_NAME);
 	}
 	
 	private void buildConnectionPoolingProperties(Properties properties) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/ddlgen/wizards/EclipseLinkGenerateDDLWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/ddlgen/wizards/EclipseLinkGenerateDDLWizard.java
index e465abd483..6e2354d2ba 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/ddlgen/wizards/EclipseLinkGenerateDDLWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/ddlgen/wizards/EclipseLinkGenerateDDLWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -213,7 +213,7 @@ public class EclipseLinkGenerateDDLWizard extends Wizard {
 
 			IPath projecName = new Path(this.getJavaProject().getProject().getName());
 			IContainer container = (IContainer)ResourcesPlugin.getWorkspace().getRoot().findMember(projecName);
-			IFile sqlFile = container.getFile(new Path(EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME));
+			IFile sqlFile = container.getFile(new Path(EclipseLinkSchemaGeneration.DEFAULT_CREATE_FILE_NAME));
 
 			this.openEditor(sqlFile);
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java
index 11dd4d11b7..a86aec1556 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java
@@ -55,20 +55,20 @@ public class EclipseLinkCacheSizeCombo
 
 	@Override
 	protected PropertyValueModel<Integer> buildDefaultModel() {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.intSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.DEFAULT_SIZE_PROPERTY,
-				EclipseLinkCaching.DEFAULT_SIZE_TRANSFORMER
+				c -> c.getDefaultSize()
 			);
 	}
 
 	@Override
 	protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_SIZE_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_SIZE_TRANSFORMER,
-				EclipseLinkCaching.SET_SPECIFIED_SIZE_CLOSURE
+				c -> c.getSpecifiedSize(),
+				(c, value) -> c.setSpecifiedSize(value)
 			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
index e99c2df8c3..393566750e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
@@ -13,7 +13,6 @@ import java.util.Collection;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -24,8 +23,8 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkExistenceType;
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLinkJavaEntityComposite;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
@@ -180,7 +179,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 	protected abstract void initializeExistenceCheckingComposite(Composite container);
 	
 	private PropertyValueModel<Boolean> buildSharedCacheEnabler() {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.booleanSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SHARED_PROPERTY,
 				EclipseLinkCaching.SHARED_PREDICATE
@@ -188,11 +187,11 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 	}	
 	
 	private ModifiablePropertyValueModel<Boolean> buildSpecifiedSharedModel() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_SHARED_TRANSFORMER,
-				EclipseLinkCaching.SET_SPECIFIED_SHARED_CLOSURE
+				c -> c.getSpecifiedShared(),
+				(c, value) -> c.setSpecifiedShared(value)
 			);
 	}
 
@@ -206,21 +205,21 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultSharedModel() {
-		return TriStateCheckBoxLabelModelAdapter.propertyValueModel(
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_SHARED_TRANSFORMER,
+				c -> c.getSpecifiedShared(),
 				EclipseLinkCaching.DEFAULT_SHARED_PROPERTY,
-				EclipseLinkCaching.DEFAULT_SHARED_PREDICATE
+				c -> c.getDefaultShared()
 			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildAlwaysRefreshModel() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_TRANSFORMER,
-				EclipseLinkCaching.SET_SPECIFIED_ALWAYS_REFRESH_CLOSURE
+				c -> c.getSpecifiedAlwaysRefresh(),
+				(c, value) -> c.setSpecifiedAlwaysRefresh(value)
 			);
 	}
 
@@ -234,27 +233,21 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 		);
 	
 	private PropertyValueModel<Boolean> buildDefaultAlwaysRefreshModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY,
-			EclipseLinkCaching.DEFAULT_ALWAYS_REFRESH_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedAlwaysRefresh() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.getDefaultAlwaysRefresh());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY,
+				c -> c.getSpecifiedAlwaysRefresh(),
+				EclipseLinkCaching.DEFAULT_ALWAYS_REFRESH_PROPERTY,
+				c -> c.getDefaultAlwaysRefresh()
+			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildRefreshOnlyIfNewerModel() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_TRANSFORMER,
-				EclipseLinkCaching.SET_SPECIFIED_REFRESH_ONLY_IF_NEWER_CLOSURE
+				c -> c.getSpecifiedRefreshOnlyIfNewer(),
+				(c, value) -> c.setSpecifiedRefreshOnlyIfNewer(value)
 			);
 	}
 
@@ -268,26 +261,21 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultRefreshOnlyIfNewerModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY,
-			EclipseLinkCaching.DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedRefreshOnlyIfNewer() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.getDefaultRefreshOnlyIfNewer());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY,
+				c -> c.getSpecifiedRefreshOnlyIfNewer(),
+				EclipseLinkCaching.DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY,
+				c -> c.getDefaultRefreshOnlyIfNewer()
+			);
 	}	
+
 	private ModifiablePropertyValueModel<Boolean> buildDisableHitsModel() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.getSubjectHolder(),
 				EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY,
-				EclipseLinkCaching.SPECIFIED_DISABLE_HITS_TRANSFORMER,
-				EclipseLinkCaching.SET_SPECIFIED_DISABLE_HITS_CLOSURE
+				c -> c.getSpecifiedDisableHits(),
+				(c, value) -> c.setSpecifiedDisableHits(value)
 			);
 	}
 
@@ -301,19 +289,13 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 			);
 	
 	private PropertyValueModel<Boolean> buildDefaultDisableHitsModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY,
-			EclipseLinkCaching.DEFAULT_DISABLE_HITS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedDisableHits() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.getDefaultDisableHits());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY,
+				c -> c.getSpecifiedDisableHits(),
+				EclipseLinkCaching.DEFAULT_DISABLE_HITS_PROPERTY,
+				c -> c.getDefaultDisableHits()
+			);
 	}
 
 	private EnumFormComboViewer<EclipseLinkCaching, EclipseLinkCacheCoordinationType> addCacheCoordinationTypeCombo(Composite container, PropertyValueModel<Boolean> sharedCacheEnableModel) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java
index b4a96a732f..5b4bf3fba8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java
@@ -21,8 +21,9 @@ import org.eclipse.jpt.jpa.core.jpa2.context.CacheableReference2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching;
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLinkJavaEntityComposite;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.jpa2.details.JptJpaUiDetailsMessages2_0;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -169,18 +170,12 @@ public abstract class EclipseLinkCachingComposite2_0<T extends EclipseLinkCachin
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultCacheableModel(PropertyValueModel<Cacheable2_0> cacheableModel) {
-		return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>(
-			cacheableModel,
-			Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY,
-			Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedCacheable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultCacheable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				cacheableModel,
+				Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY,
+				c -> c.getSpecifiedCacheable(),
+				Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY,
+				c -> c.getDefaultCacheable()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
index 679f351ccc..db2db8989e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java
@@ -35,6 +35,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFacto
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTenantDiscriminatorColumnsComposite.TenantDiscriminatorColumnsEditor;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -125,7 +126,7 @@ public class EclipseLinkMultitenancyComposite
 		return new PropertyAspectAdapterXXXX<EclipseLinkMultitenancy2_3, Boolean>(getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_MULTITENANT_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
-				return Boolean.valueOf(this.subject.isSpecifiedMultitenant());
+				return Boolean.valueOf(this.subject.getSpecifiedMultitenant());
 			}
 
 			@Override
@@ -210,19 +211,13 @@ public class EclipseLinkMultitenancyComposite
 			);
 
 	PropertyValueModel<Boolean> buildDefaultIncludeCriteriaModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkMultitenancy2_3, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				EclipseLinkMultitenancy2_3.SPECIFIED_INCLUDE_CRITERIA_PROPERTY,
-				EclipseLinkMultitenancy2_3.DEFAULT_INCLUDE_CRITERIA_PROPERTY) {
-
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedIncludeCriteria() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isIncludeCriteria());
-			}
-		};
+				m -> m.getSpecifiedIncludeCriteria(),
+				EclipseLinkMultitenancy2_3.DEFAULT_INCLUDE_CRITERIA_PROPERTY,
+				m -> m.getDefaultIncludeCriteria()
+			);
 	}
 
 	protected EclipseLinkTenantDiscriminatorColumnsComposite<EclipseLinkMultitenancy2_3>  buildTenantDiscriminatorColumnsComposite(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java
index 32fee2fb24..4a17750771 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable;
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -95,18 +96,12 @@ public class EclipseLinkMutableTriStateCheckBox
 			);
 
 	private PropertyValueModel<Boolean> buildDefaultMutableModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkMutable, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkMutable.SPECIFIED_MUTABLE_PROPERTY,
-			EclipseLinkMutable.DEFAULT_MUTABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedMutable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultMutable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				EclipseLinkMutable.SPECIFIED_MUTABLE_PROPERTY,
+				m -> m.getSpecifiedMutable(),
+				EclipseLinkMutable.DEFAULT_MUTABLE_PROPERTY,
+				m -> m.getDefaultMutable()
+			);
 	}
-}
\ No newline at end of file
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java
index ebbde1c17d..940fb9aaac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkReadOnly;
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -96,18 +97,12 @@ public class EclipseLinkReadOnlyTriStateCheckBox
 			);
 
 	private PropertyValueModel<Boolean> buildDefaultReadOnlyModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkReadOnly, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkReadOnly.SPECIFIED_READ_ONLY_PROPERTY,
-			EclipseLinkReadOnly.DEFAULT_READ_ONLY_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedReadOnly() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultReadOnly());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				EclipseLinkReadOnly.SPECIFIED_READ_ONLY_PROPERTY,
+				ro -> ro.getSpecifiedReadOnly(),
+				EclipseLinkReadOnly.DEFAULT_READ_ONLY_PROPERTY,
+				ro -> ro.getDefaultReadOnly()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java
index dc89d0b61f..bda192e7e1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java
@@ -37,6 +37,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFacto
 import org.eclipse.jpt.jpa.eclipselink.ui.details.JptJpaEclipseLinkUiDetailsMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
 import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.details.db.ColumnCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.DatabaseObjectCombo;
@@ -417,18 +418,12 @@ public class EclipseLinkTenantDiscriminatorColumnComposite
 			);
 
 	PropertyValueModel<Boolean> buildDefaultPrimaryKeyModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				EclipseLinkTenantDiscriminatorColumn2_3.SPECIFIED_PRIMARY_KEY_PROPERTY,
-				EclipseLinkTenantDiscriminatorColumn2_3.DEFAULT_PRIMARY_KEY_PROPERTY) {
-
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedPrimaryKey() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isPrimaryKey());
-			}
-		};
+				tdc -> tdc.getSpecifiedPrimaryKey(),
+				EclipseLinkTenantDiscriminatorColumn2_3.DEFAULT_PRIMARY_KEY_PROPERTY,
+				tdc -> tdc.getDefaultPrimaryKey()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java
index 12c7672f71..dfbfc6a367 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java
@@ -22,6 +22,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkLoggi
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkLoggingLevel;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options.EclipseLinkLoggingComposite;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -162,18 +163,13 @@ public class EclipseLinkLoggingComposite2_0
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultConnectionModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkLogging2_0, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkLogging2_0.CONNECTION_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getConnection() != null) {
-					return null;
-				}
-				return this.subject.getDefaultConnection();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkLogging2_0.CONNECTION_PROPERTY,
+				m -> m.getConnection(),
+				EclipseLinkLogging2_0.DEFAULT_CONNECTION_PROPERTY,
+				m -> m.getDefaultConnection()
+			);
 	}
 	private static final String DEFAULT_PROPERTY = EclipseLinkLogging2_0.CATEGORIES_DEFAULT_LOGGING_PROPERTY;
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java
index a03dce4ca7..f133046851 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java
@@ -255,7 +255,7 @@ public class EclipseLinkPersistenceUnitCachingEditorPage2_0
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkCaching.DEFAULT_CACHE_SIZE_DEFAULT_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultCacheSizeDefault());
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java
index a96b8b9383..89594f07b4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCache
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCaching;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -152,7 +153,7 @@ public class EclipseLinkCacheDefaultsComposite<T extends EclipseLinkCaching>
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkCaching.DEFAULT_CACHE_SIZE_DEFAULT_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultCacheSizeDefault());
 		}
 
 		@Override
@@ -195,17 +196,12 @@ public class EclipseLinkCacheDefaultsComposite<T extends EclipseLinkCaching>
 			);
 
 	private PropertyValueModel<Boolean> buildDefaultDefaultSharedCacheModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSharedCacheDefault() != null) {
-					return null;
-				}
-				return this.subject.getDefaultSharedCacheDefault();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY,
+				c -> c.getSharedCacheDefault(),
+				EclipseLinkCaching.DEFAULT_SHARED_CACHE_DEFAULT_PROPERTY,
+				c -> c.getDefaultSharedCacheDefault()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
index c6aab0d9dd..4653fb3103 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
@@ -32,6 +32,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCachi
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCachingEntity;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -286,10 +287,10 @@ public class EclipseLinkEntityCachingPropertyComposite
 	}
 
 	private ListValueModel<Boolean> buildDefaultAndNonDefaultSharedCacheListModel() {
-		ArrayList<ListValueModel<Boolean>> holders = new ArrayList<>(2);
-		holders.add(buildSharedCacheListModel());
-		holders.add(buildDefaultSharedCacheListModel());
-		return CompositeListValueModel.forModels(holders);
+		ArrayList<ListValueModel<Boolean>> models = new ArrayList<>(2);
+		models.add(buildSharedCacheListModel());
+		models.add(buildDefaultSharedCacheListModel());
+		return CompositeListValueModel.forModels(models);
 	}
 
 	private ListValueModel<Boolean> buildSharedCacheListModel() {
@@ -305,15 +306,12 @@ public class EclipseLinkEntityCachingPropertyComposite
 	}
 
 	private PropertyValueModel<Boolean> buildDefaultSharedCacheModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(this.buildCachingModel(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) {
-			@Override
-			protected Boolean buildValue_() {
-				Boolean b = this.subject.getSharedCacheDefault();
-				if (b == null) {
-					b = this.subject.getDefaultSharedCacheDefault();
-				}
-				return b;
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.buildCachingModel(),
+				EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY,
+				c -> c.getSharedCacheDefault(),
+				EclipseLinkCaching.DEFAULT_SHARED_CACHE_DEFAULT_PROPERTY,
+				c -> c.getDefaultSharedCacheDefault()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java
index 995ea9c054..4b3da0e80a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java
@@ -38,8 +38,9 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkConne
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.plugin.JptJpaEclipseLinkUiPlugin;
 import org.eclipse.jpt.jpa.ui.JpaWorkbench;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.jpa2.persistence.JptJpaUiPersistenceMessages2_0;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -240,18 +241,13 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultBindParametersModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkConnection.BIND_PARAMETERS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getBindParameters() != null) {
-					return null;
-				}
-				return this.subject.getDefaultBindParameters();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkConnection.BIND_PARAMETERS_PROPERTY,
+				c -> c.getBindParameters(),
+				EclipseLinkConnection.DEFAULT_BIND_PARAMETERS_PROPERTY,
+				c -> c.getDefaultBindParameters()
+			);
 	}
 
 	void promptConnection() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java
index 438f6f59f3..b12a43b153 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java
@@ -21,8 +21,9 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkConnection;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkExclusiveConnectionMode;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
@@ -140,17 +141,12 @@ public class EclipseLinkJdbcExclusiveConnectionsPropertiesComposite<T extends Ec
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultLazyConnectionModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(
-			this.getSubjectHolder(),
-			EclipseLinkConnection.LAZY_CONNECTION_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getLazyConnection() != null) {
-					return null;
-				}
-				return this.subject.getDefaultLazyConnection();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkConnection.LAZY_CONNECTION_PROPERTY,
+				c -> c.getLazyConnection(),
+				EclipseLinkConnection.DEFAULT_LAZY_CONNECTION_PROPERTY,
+				c -> c.getDefaultLazyConnection()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java
index 680c4b0336..b23317c573 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java
@@ -19,8 +19,9 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkConnection;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -159,18 +160,13 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultReadConnectionsSharedModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkConnection.READ_CONNECTIONS_SHARED_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getReadConnectionsShared() != null) {
-					return null;
-				}
-				return this.subject.getDefaultReadConnectionsShared();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkConnection.READ_CONNECTIONS_SHARED_PROPERTY,
+				c -> c.getReadConnectionsShared(),
+				EclipseLinkConnection.DEFAULT_READ_CONNECTIONS_SHARED_PROPERTY,
+				c -> c.getDefaultReadConnectionsShared()
+			);
 	}
 
 	
@@ -193,7 +189,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection>
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkConnection.DEFAULT_READ_CONNECTIONS_MIN_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultReadConnectionsMin());
 		}
 
 		@Override
@@ -231,7 +227,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection>
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkConnection.DEFAULT_READ_CONNECTIONS_MAX_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultReadConnectionsMax());
 		}
 
 		@Override
@@ -269,7 +265,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection>
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkConnection.DEFAULT_WRITE_CONNECTIONS_MIN_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultWriteConnectionsMin());
 		}
 
 		@Override
@@ -307,7 +303,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection>
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkConnection.DEFAULT_WRITE_CONNECTIONS_MAX_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultWriteConnectionsMax());
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
index dd2e7c923f..9024cc28e5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java
@@ -26,8 +26,9 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitTransactionTy
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkBatchWriting;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkConnection;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -265,18 +266,13 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultNativeSqlModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkConnection.NATIVE_SQL_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getNativeSql() != null) {
-					return null;
-				}
-				return this.subject.getDefaultNativeSql();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkConnection.NATIVE_SQL_PROPERTY,
+				c -> c.getNativeSql(),
+				EclipseLinkConnection.DEFAULT_NATIVE_SQL_PROPERTY,
+				c -> c.getDefaultNativeSql()
+			);
 	}
 
 
@@ -324,7 +320,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage
 
 		@Override
 		protected PropertyValueModel<Integer> buildDefaultModel() {
-			return PropertyValueModelTools.transform(this.getSubjectHolder(), EclipseLinkConnection.DEFAULT_CACHE_STATEMENTS_SIZE_TRANSFORMER);
+			return PropertyValueModelTools.transform(this.getSubjectHolder(), c -> c.getDefaultCacheStatementsSize());
 		}
 
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
index 32930bad62..60e71e8b0a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCustomization;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -182,18 +183,13 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultValidationOnlyModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.VALIDATION_ONLY_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getValidationOnly() != null) {
-					return null;
-				}
-				return this.subject.getDefaultValidationOnly();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.VALIDATION_ONLY_PROPERTY,
+				c -> c.getValidationOnly(),
+				EclipseLinkCustomization.DEFAULT_VALIDATION_ONLY_PROPERTY,
+				c -> c.getDefaultValidationOnly()
+			);
 	}
 
 
@@ -223,18 +219,13 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultValidateSchemaModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.VALIDATE_SCHEMA_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getValidateSchema() != null) {
-					return null;
-				}
-				return this.subject.getDefaultValidateSchema();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.VALIDATE_SCHEMA_PROPERTY,
+				c -> c.getValidateSchema(),
+				EclipseLinkCustomization.DEFAULT_VALIDATE_SCHEMA_PROPERTY,
+				c -> c.getDefaultValidateSchema()
+			);
 	}
 
 
@@ -263,18 +254,13 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultThrowExceptionsModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getThrowExceptions() != null) {
-					return null;
-				}
-				return this.subject.getDefaultThrowExceptions();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY,
+				c -> c.getThrowExceptions(),
+				EclipseLinkCustomization.DEFAULT_THROW_EXCEPTIONS_PROPERTY,
+				c -> c.getDefaultThrowExceptions()
+			);
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java
index eaef557c5a..7ec53d1100 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java
@@ -22,6 +22,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkCusto
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkWeaving;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -188,18 +189,13 @@ public class EclipseLinkWeavingPropertiesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultWeavingLazyModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.WEAVING_LAZY_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getWeavingLazy() != null) {
-					return null;
-				}
-				return this.subject.getDefaultWeavingLazy();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.WEAVING_LAZY_PROPERTY,
+				c -> c.getWeavingLazy(),
+				EclipseLinkCustomization.DEFAULT_WEAVING_LAZY_PROPERTY,
+				c -> c.getDefaultWeavingLazy()
+			);
 	}
 
 
@@ -229,18 +225,13 @@ public class EclipseLinkWeavingPropertiesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultWeavingFetchGroupsModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.WEAVING_FETCH_GROUPS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getWeavingFetchGroups() != null) {
-					return null;
-				}
-				return this.subject.getDefaultWeavingFetchGroups();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.WEAVING_FETCH_GROUPS_PROPERTY,
+				c -> c.getWeavingFetchGroups(),
+				EclipseLinkCustomization.DEFAULT_WEAVING_FETCH_GROUPS_PROPERTY,
+				c -> c.getDefaultWeavingFetchGroups()
+			);
 	}
 
 
@@ -270,18 +261,13 @@ public class EclipseLinkWeavingPropertiesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultWeavingInternalModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.WEAVING_INTERNAL_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getWeavingInternal() != null) {
-					return null;
-				}
-				return this.subject.getDefaultWeavingInternal();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.WEAVING_INTERNAL_PROPERTY,
+				c -> c.getWeavingInternal(),
+				EclipseLinkCustomization.DEFAULT_WEAVING_INTERNAL_PROPERTY,
+				c -> c.getDefaultWeavingInternal()
+			);
 	}
 
 
@@ -311,18 +297,13 @@ public class EclipseLinkWeavingPropertiesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultWeavingEagerModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.WEAVING_EAGER_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getWeavingEager() != null) {
-					return null;
-				}
-				return this.subject.getDefaultWeavingEager();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.WEAVING_EAGER_PROPERTY,
+				c -> c.getWeavingEager(),
+				EclipseLinkCustomization.DEFAULT_WEAVING_EAGER_PROPERTY,
+				c -> c.getDefaultWeavingEager()
+			);
 	}
 
 
@@ -352,17 +333,12 @@ public class EclipseLinkWeavingPropertiesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultWeavingChangeTrackingModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkCustomization.WEAVING_CHANGE_TRACKING_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getWeavingChangeTracking() != null) {
-					return null;
-				}
-				return this.subject.getDefaultWeavingChangeTracking();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkCustomization.WEAVING_CHANGE_TRACKING_PROPERTY,
+				c -> c.getWeavingChangeTracking(),
+				EclipseLinkCustomization.DEFAULT_WEAVING_CHANGE_TRACKING_PROPERTY,
+				c -> c.getDefaultWeavingChangeTracking()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
index f45107dbf3..e0dc2f7c45 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java
@@ -17,10 +17,12 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkGeneralProperties;
+import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkLogging2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitMappingFilesComposite;
 import org.eclipse.swt.widgets.Composite;
 
@@ -56,12 +58,12 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite
 		{
 			@Override
 			protected Boolean buildValue_() {
-				return this.subject.getExcludeEclipselinkOrm();
+				return this.subject.getExcludeEclipseLinkOrm();
 			}
 
 			@Override
 			protected void setValue_(Boolean value) {
-				this.subject.setExcludeEclipselinkOrm(value);
+				this.subject.setExcludeEclipseLinkOrm(value);
 			}
 		};
 	}
@@ -76,17 +78,12 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultExcludeEclipselinkOrmModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean>(
-			buildGeneralPropertiesModel(),
-			EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getExcludeEclipselinkOrm() != null) {
-					return null;
-				}
-				return this.subject.getDefaultExcludeEclipselinkOrm();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.buildGeneralPropertiesModel(),
+				EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY,
+				m -> m.getExcludeEclipseLinkOrm(),
+				EclipseLinkGeneralProperties.DEFAULT_EXCLUDE_ECLIPSELINK_ORM_PROPERTY,
+				m -> m.getDefaultExcludeEclipseLinkOrm()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
index d2fa622b41..70940589bf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java
@@ -24,6 +24,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkLoggi
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkLoggingLevel;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.layout.GridData;
@@ -254,18 +255,13 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultTimestampModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkLogging.TIMESTAMP_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getTimestamp() != null) {
-					return null;
-				}
-				return this.subject.getDefaultTimestamp();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkLogging.TIMESTAMP_PROPERTY,
+				m -> m.getTimestamp(),
+				EclipseLinkLogging.DEFAULT_TIMESTAMP_PROPERTY,
+				m -> m.getDefaultTimestamp()
+			);
 	}
 
 
@@ -295,18 +291,13 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultThreadModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkLogging.THREAD_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getThread() != null) {
-					return null;
-				}
-				return this.subject.getDefaultThread();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkLogging.THREAD_PROPERTY,
+				m -> m.getThread(),
+				EclipseLinkLogging.DEFAULT_THREAD_PROPERTY,
+				m -> m.getDefaultThread()
+			);
 	}
 
 
@@ -336,18 +327,13 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultSessionModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkLogging.SESSION_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSession() != null) {
-					return null;
-				}
-				return this.subject.getDefaultSession();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkLogging.SESSION_PROPERTY,
+				m -> m.getSession(),
+				EclipseLinkLogging.DEFAULT_SESSION_PROPERTY,
+				m -> m.getDefaultSession()
+			);
 	}
 
 
@@ -377,17 +363,12 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultExceptionsModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(
-			getSubjectHolder(),
-			EclipseLinkLogging.EXCEPTIONS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getExceptions() != null) {
-					return null;
-				}
-				return this.subject.getDefaultExceptions();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				EclipseLinkLogging.EXCEPTIONS_PROPERTY,
+				m -> m.getExceptions(),
+				EclipseLinkLogging.DEFAULT_EXCEPTIONS_PROPERTY,
+				m -> m.getDefaultExceptions()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
index 560fe6ddd0..1042be074e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java
@@ -45,6 +45,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkTarge
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkTargetServer;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -722,18 +723,13 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultIncludeDescriptorQueriesModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>(
-			this.optionsModel,
-			EclipseLinkOptions.INCLUDE_DESCRIPTOR_QUERIES_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getIncludeDescriptorQueries() != null) {
-					return null;
-				}
-				return this.subject.getDefaultIncludeDescriptorQueries();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.optionsModel,
+				EclipseLinkOptions.INCLUDE_DESCRIPTOR_QUERIES_PROPERTY,
+				m -> m.getIncludeDescriptorQueries(),
+				EclipseLinkOptions.DEFAULT_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY,
+				m -> m.getDefaultIncludeDescriptorQueries()
+			);
 	}
 
 
@@ -763,17 +759,12 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultTemporalMutableModel() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>(
-			this.optionsModel,
-			EclipseLinkOptions.TEMPORAL_MUTABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getTemporalMutable() != null) {
-					return null;
-				}
-				return this.subject.getDefaultTemporalMutable();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.optionsModel,
+				EclipseLinkOptions.TEMPORAL_MUTABLE_PROPERTY,
+				m -> m.getTemporalMutable(),
+				EclipseLinkOptions.DEFAULT_TEMPORAL_MUTABLE_PROPERTY,
+				m -> m.getDefaultTemporalMutable()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java
index 443bfbaa4a..ca5110cdda 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -189,7 +189,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite
 	//************ Create DDL file name ************
 
 	private PropertyValueModel<String> buildDefaultCreateDdlFileNameHolder() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME) {
+		return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_CREATE_FILE_NAME) {
 			@Override
 			protected String buildValue_() {
 				return EclipseLinkPersistenceXmlSchemaGenerationComposite.this.getDefaultCreateFileNameValue(subject);
@@ -243,7 +243,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite
 
 
 	private PropertyValueModel<String> buildDefaultDropDdlFileNameHolder() {
-		return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME) {
+		return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_DROP_FILE_NAME) {
 			@Override
 			protected String buildValue_() {
 				return EclipseLinkPersistenceXmlSchemaGenerationComposite.this.getDefaultDropDdlFileNameValue(subject);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java
index 7f6aecf818..3732bb7f8c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java
@@ -72,7 +72,7 @@ public class EclipseLinkNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<MappingFileRef> buildPersistenceUnitImpliedEclipseLinkMappingFileRefModel(EclipseLinkPersistenceUnit item) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				item,
 				EclipseLinkPersistenceUnit.IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY,
 				EclipseLinkPersistenceUnit.IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_TRANSFORMER
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/TriStateCheckBoxLabelModelAdapter.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/TriStateCheckBoxLabelModelAdapter.java
index 9a41a42b7c..c255a9f47f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/TriStateCheckBoxLabelModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/TriStateCheckBoxLabelModelAdapter.java
@@ -164,59 +164,59 @@ public class TriStateCheckBoxLabelModelAdapter
 
 	// ********** Convenience methods **********
 
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> propertyValueModel(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> adaptSubjectModelAspects_(
 			SM subjectModel,
 			String specifiedAspectName,
 			Transformer<? super S, Boolean> specifiedTransformer,
 			String defaultAspectName,
 			Predicate<? super S> defaultPredicate
 	) {
-		return propertyValueModel(
-				PropertyValueModelTools.modelAspectAdapter(subjectModel, specifiedAspectName, specifiedTransformer),
-				PropertyValueModelTools.modelAspectAdapter(subjectModel, defaultAspectName, defaultPredicate)
+		return adaptModels(
+				PropertyValueModelTools.subjectModelAspectAdapter(subjectModel, specifiedAspectName, specifiedTransformer),
+				PropertyValueModelTools.booleanSubjectModelAspectAdapter(subjectModel, defaultAspectName, defaultPredicate)
 			);
 	}
 
-	public static <S extends Model> PropertyValueModel<Boolean> propertyValueModel(
+	public static <S extends Model> PropertyValueModel<Boolean> adaptSubjectAspects_(
 			S subject,
 			String specifiedAspectName,
 			Transformer<? super S, Boolean> specifiedTransformer,
 			String defaultAspectName,
 			Predicate<? super S> defaultPredicate
 	) {
-		return propertyValueModel(
-				PropertyValueModelTools.modelAspectAdapter(subject, specifiedAspectName, specifiedTransformer),
-				PropertyValueModelTools.modelAspectAdapter(subject, defaultAspectName, defaultPredicate)
+		return adaptModels(
+				PropertyValueModelTools.subjectAspectAdapter(subject, specifiedAspectName, specifiedTransformer),
+				PropertyValueModelTools.booleanSubjectAspectAdapter(subject, defaultAspectName, defaultPredicate)
 			);
 	}
 
-	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> propertyValueModel(
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> adaptSubjectModelAspects(
 			SM subjectModel,
 			String specifiedAspectName,
 			Transformer<? super S, Boolean> specifiedTransformer,
 			String defaultAspectName,
 			Transformer<? super S, Boolean> defaultTransformer
 	) {
-		return propertyValueModel(
-				PropertyValueModelTools.modelAspectAdapter(subjectModel, specifiedAspectName, specifiedTransformer),
-				PropertyValueModelTools.modelAspectAdapter(subjectModel, defaultAspectName, defaultTransformer)
+		return adaptModels(
+				PropertyValueModelTools.subjectModelAspectAdapter(subjectModel, specifiedAspectName, specifiedTransformer),
+				PropertyValueModelTools.subjectModelAspectAdapter(subjectModel, defaultAspectName, defaultTransformer)
 			);
 	}
 
-	public static <S extends Model> PropertyValueModel<Boolean> propertyValueModel(
+	public static <S extends Model> PropertyValueModel<Boolean> adaptSubjectAspects(
 			S subject,
 			String specifiedAspectName,
 			Transformer<? super S, Boolean> specifiedTransformer,
 			String defaultAspectName,
 			Transformer<? super S, Boolean> defaultTransformer
 	) {
-		return propertyValueModel(
-				PropertyValueModelTools.modelAspectAdapter(subject, specifiedAspectName, specifiedTransformer),
-				PropertyValueModelTools.modelAspectAdapter(subject, defaultAspectName, defaultTransformer)
+		return adaptModels(
+				PropertyValueModelTools.subjectAspectAdapter(subject, specifiedAspectName, specifiedTransformer),
+				PropertyValueModelTools.subjectAspectAdapter(subject, defaultAspectName, defaultTransformer)
 			);
 	}
 
-	public static PropertyValueModel<Boolean> propertyValueModel(PropertyValueModel<Boolean> specifiedModel, PropertyValueModel<Boolean> defaultModel) {
+	public static PropertyValueModel<Boolean> adaptModels(PropertyValueModel<Boolean> specifiedModel, PropertyValueModel<Boolean> defaultModel) {
 		return PropertyValueModelTools.propertyValueModel(new Factory(specifiedModel, defaultModel));
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
index f05fc12a56..600aefe97c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
@@ -28,8 +28,9 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedColumn;
 import org.eclipse.jpt.jpa.core.context.TableColumn;
 import org.eclipse.jpt.jpa.db.Table;
 import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.details.db.ColumnCombo;
 import org.eclipse.jpt.jpa.ui.internal.details.db.DatabaseObjectCombo;
 import org.eclipse.osgi.util.NLS;
@@ -158,19 +159,13 @@ public class ColumnComposite
 		);
 
 	PropertyValueModel<Boolean> buildDefaultInsertableModel() {
-		return new PropertyAspectAdapterXXXX<Column, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				BaseColumn.SPECIFIED_INSERTABLE_PROPERTY,
-				BaseColumn.DEFAULT_INSERTABLE_PROPERTY) {
-			
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedInsertable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultInsertable());
-			}
-		};
+				m -> m.getSpecifiedInsertable(),
+				BaseColumn.DEFAULT_INSERTABLE_PROPERTY,
+				m -> m.getDefaultInsertable()
+			);
 	}
 	
 	ModifiablePropertyValueModel<Boolean> buildNullableModel() {
@@ -200,19 +195,13 @@ public class ColumnComposite
 		);
 
 	PropertyValueModel<Boolean> buildDefaultNullableModel() {
-		return new PropertyAspectAdapterXXXX<Column, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				BaseColumn.SPECIFIED_NULLABLE_PROPERTY,
-				BaseColumn.DEFAULT_NULLABLE_PROPERTY) {
-			
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedNullable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultNullable());
-			}
-		};
+				m -> m.getSpecifiedNullable(),
+				BaseColumn.DEFAULT_NULLABLE_PROPERTY,
+				m -> m.getDefaultNullable()
+			);
 	}
 	
 	private Pane<Column> addTableCombo(Composite container) {
@@ -294,19 +283,13 @@ public class ColumnComposite
 		);
 
 	PropertyValueModel<Boolean> buildDefaultUniqueModel() {
-		return new PropertyAspectAdapterXXXX<Column, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				BaseColumn.SPECIFIED_UNIQUE_PROPERTY,
-				BaseColumn.DEFAULT_UNIQUE_PROPERTY) {
-			
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedUnique() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultUnique());
-			}
-		};
+				m -> m.getSpecifiedUnique(),
+				BaseColumn.DEFAULT_UNIQUE_PROPERTY,
+				m -> m.getDefaultUnique()
+			);
 	}
 	
 	ModifiablePropertyValueModel<Boolean> buildUpdatableModel() {
@@ -337,19 +320,13 @@ public class ColumnComposite
 		);
 
 	PropertyValueModel<Boolean> buildDefaultUpdatableModel() {
-		return new PropertyAspectAdapterXXXX<Column, Boolean>(
-				getSubjectHolder(),
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
 				BaseColumn.SPECIFIED_UPDATABLE_PROPERTY,
-				BaseColumn.DEFAULT_UPDATABLE_PROPERTY) {
-			
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedUpdatable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultUpdatable());
-			}
-		};
+				m -> m.getSpecifiedUpdatable(),
+				BaseColumn.DEFAULT_UPDATABLE_PROPERTY,
+				m -> m.getDefaultUpdatable()
+			);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
index 360dd6a0f3..ab5a119a1c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java
@@ -16,8 +16,9 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.widgets.Composite;
 
 public class JoinColumnDialogPane<T extends JoinColumnStateObject>
@@ -55,18 +56,13 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultInsertableModel() {
-		return new PropertyAspectAdapterXXXX<T, Boolean>(
-			getSubjectHolder(),
-			JoinColumnStateObject.INSERTABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getInsertable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultInsertable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				JoinColumnStateObject.INSERTABLE_PROPERTY,
+				m -> m.getInsertable(),
+				JoinColumnStateObject.DEFAULT_INSERTABLE_PROPERTY,
+				m -> m.getDefaultInsertable()
+			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildNullableModel() {
@@ -96,18 +92,13 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultNullableModel() {
-		return new PropertyAspectAdapterXXXX<T, Boolean>(
-			getSubjectHolder(),
-			JoinColumnStateObject.NULLABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getNullable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultNullable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				JoinColumnStateObject.NULLABLE_PROPERTY,
+				m -> m.getNullable(),
+				JoinColumnStateObject.DEFAULT_NULLABLE_PROPERTY,
+				m -> m.getDefaultNullable()
+			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildUniqueModel() {
@@ -137,18 +128,13 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultUniqueModel() {
-		return new PropertyAspectAdapterXXXX<T, Boolean>(
-			getSubjectHolder(),
-			JoinColumnStateObject.UNIQUE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getUnique() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultUnique());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				JoinColumnStateObject.UNIQUE_PROPERTY,
+				m -> m.getUnique(),
+				JoinColumnStateObject.DEFAULT_UNIQUE_PROPERTY,
+				m -> m.getDefaultUnique()
+			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildUpdatableModel() {
@@ -175,18 +161,13 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultUpdatableModel() {
-		return new PropertyAspectAdapterXXXX<T, Boolean>(
-			getSubjectHolder(),
-			JoinColumnStateObject.UPDATABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getUpdatable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultUpdatable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				JoinColumnStateObject.UPDATABLE_PROPERTY,
+				m -> m.getUpdatable(),
+				JoinColumnStateObject.DEFAULT_UPDATABLE_PROPERTY,
+				m -> m.getDefaultUpdatable()
+			);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnStateObject.java
index 59f53ee082..f9a2491122 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnStateObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -37,9 +37,13 @@ public abstract class JoinColumnStateObject
 	private Boolean updatable;
 
 	public static final String INSERTABLE_PROPERTY = "insertable";
+	public static final String DEFAULT_INSERTABLE_PROPERTY = "defaultInsertable";
 	public static final String NULLABLE_PROPERTY = "nullable";
+	public static final String DEFAULT_NULLABLE_PROPERTY = "defaultNullable";
 	public static final String UNIQUE_PROPERTY = "unique";
+	public static final String DEFAULT_UNIQUE_PROPERTY = "defaultUnique";
 	public static final String UPDATABLE_PROPERTY = "updatable";
+	public static final String DEFAULT_UPDATABLE_PROPERTY = "defaultUpdatable";
 
 	/**
 	 * Creates a new <code>JoinColumnStateObject</code>.
@@ -51,45 +55,45 @@ public abstract class JoinColumnStateObject
 		super(owner, joinColumn);
 	}
 
-	public boolean isDefaultInsertable() {
+	public boolean getDefaultInsertable() {
 
 		SpecifiedJoinColumn joinColumn = getJoinColumn();
 
 		if (joinColumn != null) {
-			return joinColumn.isDefaultInsertable();
+			return joinColumn.getDefaultInsertable();
 		}
 
 		return BaseColumn.DEFAULT_INSERTABLE;
 	}
 
-	public boolean isDefaultNullable() {
+	public boolean getDefaultNullable() {
 
 		SpecifiedJoinColumn joinColumn = getJoinColumn();
 
 		if (joinColumn != null) {
-			return joinColumn.isDefaultNullable();
+			return joinColumn.getDefaultNullable();
 		}
 
 		return BaseColumn.DEFAULT_NULLABLE;
 	}
 
-	public boolean isDefaultUnique() {
+	public boolean getDefaultUnique() {
 
 		SpecifiedJoinColumn joinColumn = getJoinColumn();
 
 		if (joinColumn != null) {
-			return joinColumn.isDefaultUnique();
+			return joinColumn.getDefaultUnique();
 		}
 
 		return BaseColumn.DEFAULT_UNIQUE;
 	}
 
-	public boolean isDefaultUpdatable() {
+	public boolean getDefaultUpdatable() {
 
 		SpecifiedJoinColumn joinColumn = getJoinColumn();
 
 		if (joinColumn != null) {
-			return joinColumn.isDefaultUpdatable();
+			return joinColumn.getDefaultUpdatable();
 		}
 
 		return BaseColumn.DEFAULT_UPDATABLE;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java
index 15097962cd..166688bfe6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java
@@ -18,8 +18,9 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.OptionalMapping;
 import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
@@ -91,18 +92,12 @@ public class OptionalTriStateCheckBox extends Pane<OptionalMapping>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultOptionalModel() {
-		return new PropertyAspectAdapterXXXX<OptionalMapping, Boolean>(
-			getSubjectHolder(),
-			OptionalMapping.SPECIFIED_OPTIONAL_PROPERTY,
-			OptionalMapping.DEFAULT_OPTIONAL_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedOptional() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultOptional());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				OptionalMapping.SPECIFIED_OPTIONAL_PROPERTY,
+				m -> m.getSpecifiedOptional(),
+				OptionalMapping.DEFAULT_OPTIONAL_PROPERTY,
+				m -> m.getDefaultOptional()
+			);
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java
index 98fd7aa625..7c4e66eb1c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.jpa.ui.details.orm.JptJpaUiDetailsOrmMessages;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -84,18 +85,12 @@ public class MetadataCompleteTriStateCheckBox extends Pane<OrmTypeMapping> {
 		);
 
 	private PropertyValueModel<Boolean> buildOverrideMetadataCompleteModel() {
-		return new PropertyAspectAdapterXXXX<OrmTypeMapping, Boolean>(
-			getSubjectHolder(),
-			OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY,
-			OrmTypeMapping.OVERRIDE_METADATA_COMPLETE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedMetadataComplete() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isOverrideMetadataComplete());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY,
+				m -> m.getSpecifiedMetadataComplete(),
+				OrmTypeMapping.OVERRIDE_METADATA_COMPLETE_PROPERTY,
+				m -> m.getOverrideMetadataComplete()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java
index 2da4a96fe4..cb956d7a11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java
@@ -17,8 +17,9 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.jpa2.details.JptJpaUiDetailsMessages2_0;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -95,18 +96,12 @@ public class CacheableTriStateCheckBox2_0
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultCacheableModel() {
-		return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>(
-			getSubjectHolder(),
-			Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY,
-			Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedCacheable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultCacheable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY,
+				m -> m.getSpecifiedCacheable(),
+				Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY,
+				m -> m.getDefaultCacheable()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java
index cafc335c5f..9b1787b1f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java
@@ -22,8 +22,9 @@ import org.eclipse.jpt.jpa.core.context.NamedColumn;
 import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedOrderColumn2_0;
 import org.eclipse.jpt.jpa.db.Table;
 import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.details.db.ColumnCombo;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -168,19 +169,13 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> {
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultInsertableModel() {
-		return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>(
-			getSubjectHolder(),
-			BaseColumn.SPECIFIED_INSERTABLE_PROPERTY,
-			BaseColumn.DEFAULT_INSERTABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedInsertable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultInsertable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				BaseColumn.SPECIFIED_INSERTABLE_PROPERTY,
+				m -> m.getSpecifiedInsertable(),
+				BaseColumn.DEFAULT_INSERTABLE_PROPERTY,
+				m -> m.getDefaultInsertable()
+			);
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildNullableModel() {
@@ -210,19 +205,13 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> {
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultNullableModel() {
-		return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>(
-			getSubjectHolder(),
-			BaseColumn.SPECIFIED_NULLABLE_PROPERTY,
-			BaseColumn.DEFAULT_NULLABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedNullable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultNullable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				BaseColumn.SPECIFIED_NULLABLE_PROPERTY,
+				m -> m.getSpecifiedNullable(),
+				BaseColumn.DEFAULT_NULLABLE_PROPERTY,
+				m -> m.getDefaultNullable()
+			);
 	}
 
 
@@ -254,19 +243,13 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> {
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultUpdatableModel() {
-		return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>(
-			getSubjectHolder(),
-			BaseColumn.SPECIFIED_UPDATABLE_PROPERTY,
-			BaseColumn.DEFAULT_UPDATABLE_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedUpdatable() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultUpdatable());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				BaseColumn.SPECIFIED_UPDATABLE_PROPERTY,
+				m -> m.getSpecifiedUpdatable(),
+				BaseColumn.DEFAULT_UPDATABLE_PROPERTY,
+				m -> m.getDefaultUpdatable()
+			);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java
index 9e79feee1d..a9da252ab0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java
@@ -18,6 +18,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.RelationshipMapping;
 import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.jpa2.details.JptJpaUiDetailsMessages2_0;
 import org.eclipse.swt.widgets.Composite;
@@ -100,18 +101,12 @@ public class OrphanRemovalTriStateCheckBox2_0 extends Pane<OrphanRemovable2_0>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultOrphanRemovalModel() {
-		return new PropertyAspectAdapterXXXX<OrphanRemovable2_0, Boolean>(
-			this.getSubjectHolder(),
-			OrphanRemovable2_0.SPECIFIED_ORPHAN_REMOVAL_PROPERTY,
-			OrphanRemovable2_0.DEFAULT_ORPHAN_REMOVAL_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedOrphanRemoval() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.isDefaultOrphanRemoval());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				OrphanRemovable2_0.SPECIFIED_ORPHAN_REMOVAL_PROPERTY,
+				m -> m.getSpecifiedOrphanRemoval(),
+				OrphanRemovable2_0.DEFAULT_ORPHAN_REMOVAL_PROPERTY,
+				m -> m.getDefaultOrphanRemoval()
+			);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java
index fe41b4b35a..c45baea0ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java
@@ -135,7 +135,7 @@ public class PersistenceUnitOptionsEditorPage2_0
 

 		@Override

 		protected PropertyValueModel<Integer> buildDefaultModel() {

-			return PropertyValueModelTools.transform(this.getSubjectHolder(), Options2_0.DEFAULT_LOCK_TIMEOUT_TRANSFORMER);

+			return PropertyValueModelTools.transform(this.getSubjectHolder(), o -> o.getDefaultLockTimeout());

 		}

 

 		@Override

@@ -180,7 +180,7 @@ public class PersistenceUnitOptionsEditorPage2_0
 

 		@Override

 		protected PropertyValueModel<Integer> buildDefaultModel() {

-			return PropertyValueModelTools.transform(this.getSubjectHolder(), Options2_0.DEFAULT_QUERY_TIMEOUT_TRANSFORMER);

+			return PropertyValueModelTools.transform(this.getSubjectHolder(), o -> o.getDefaultQueryTimeout());

 		}

 

 		@Override

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java
index 93daacbf1b..3cc68821f2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.jpa2_1.context.persistence.SchemaGenerationAction2_1;
 import org.eclipse.jpt.jpa.core.jpa2_1.context.persistence.SchemaGenerationTarget2_1;
 import org.eclipse.jpt.jpa.core.jpa2_1.context.persistence.schemagen.SchemaGeneration2_1;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
 import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.jpa2_1.persistence.JptJpaUiPersistenceMessages2_1;
 import org.eclipse.swt.layout.GridData;
@@ -324,18 +325,13 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1>
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultCreateDatabaseSchemasModel() {
-		return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, Boolean>(
-			this.getSubjectHolder(),
-			SchemaGeneration2_1.CREATE_DATABASE_SCHEMAS_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getCreateDatabaseSchemas() != null) {
-					return null;
-				}
-				return this.subject.getDefaultCreateDatabaseSchemas();
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects(
+				this.getSubjectHolder(),
+				SchemaGeneration2_1.CREATE_DATABASE_SCHEMAS_PROPERTY,
+				m -> m.getCreateDatabaseSchemas(),
+				SchemaGeneration2_1.DEFAULT_CREATE_DATABASE_SCHEMAS_PROPERTY,
+				m -> m.getDefaultCreateDatabaseSchemas()
+			);
 	}
 	
 	// ********** DatabaseAction **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
index 7c27e05802..6e38f66d31 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java
@@ -46,8 +46,9 @@ import org.eclipse.jpt.jpa.ui.JavaManagedTypeUiDefinition;
 import org.eclipse.jpt.jpa.ui.JpaPlatformUi;
 import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.PersistenceResourceUiDefinition;
-import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelAdapter;
+import org.eclipse.jpt.jpa.ui.internal.TriStateCheckBoxLabelModelStringTransformer;
 import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.persistence.JptJpaUiPersistenceMessages;
 import org.eclipse.swt.widgets.Composite;
@@ -179,19 +180,13 @@ public class PersistenceUnitClassesComposite
 		);
 
 	private PropertyValueModel<Boolean> buildDefaultExcludeUnlistedClassesModel() {
-		return new PropertyAspectAdapterXXXX<PersistenceUnit, Boolean>(
-			getSubjectHolder(),
-			PersistenceUnit.SPECIFIED_EXCLUDE_UNLISTED_CLASSES_PROPERTY,
-			PersistenceUnit.DEFAULT_EXCLUDE_UNLISTED_CLASSES_PROPERTY)
-		{
-			@Override
-			protected Boolean buildValue_() {
-				if (this.subject.getSpecifiedExcludeUnlistedClasses() != null) {
-					return null;
-				}
-				return Boolean.valueOf(this.subject.getDefaultExcludeUnlistedClasses());
-			}
-		};
+		return TriStateCheckBoxLabelModelAdapter.adaptSubjectModelAspects_(
+				this.getSubjectHolder(),
+				PersistenceUnit.SPECIFIED_EXCLUDE_UNLISTED_CLASSES_PROPERTY,
+				m -> m.getSpecifiedExcludeUnlistedClasses(),
+				PersistenceUnit.DEFAULT_EXCLUDE_UNLISTED_CLASSES_PROPERTY,
+				m -> m.getDefaultExcludeUnlistedClasses()
+			);
 	}
 
 	@SuppressWarnings("unused")
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java
index 394754c032..d246143ecd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java
@@ -114,7 +114,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<PersistenceXml> buildJpaContextRootPersistenceXmlModel(JpaContextRoot jpaContextRoot) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				jpaContextRoot,
 				JpaContextRoot.PERSISTENCE_XML_PROPERTY,
 				JpaContextRoot.PERSISTENCE_XML_TRANSFORMER
@@ -136,7 +136,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<Persistence> buildPersistenceXmlPersistenceModel(PersistenceXml persistenceXml) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistenceXml,
 				XmlFile.ROOT_PROPERTY,
 				TransformerTools.downcast(XmlFile.ROOT_TRANSFORMER)
@@ -235,7 +235,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<MappingFileRef> buildPersistenceUnitImpliedMappingFileRefModel(PersistenceUnit persistenceUnit) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistenceUnit,
 				PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY,
 				PersistenceUnit.IMPLIED_MAPPING_FILE_REF_TRANSFORMER
@@ -243,7 +243,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<MappingFile> buildPersistenceUnitImpliedMappingFileModel(PropertyValueModel<MappingFileRef> refModel) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectModelAspectAdapter(
 				refModel,
 				MappingFileRef.MAPPING_FILE_PROPERTY,
 				MappingFileRef.MAPPING_FILE_TRANSFORMER
@@ -390,7 +390,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory
 	}
 
 	protected PropertyValueModel<EntityMappings> buildOrmXmlEntityMappingsModel(OrmXml ormXml) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				ormXml,
 				XmlFile.ROOT_PROPERTY,
 				TransformerTools.downcast(XmlFile.ROOT_TRANSFORMER)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
index d45bdfbc05..3d2392b250 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java
@@ -122,7 +122,7 @@ public class GenericNavigatorItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<String> buildConverterTypeTextModel(ManagedType managedType) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				managedType,
 				ManagedType.SIMPLE_NAME_PROPERTY,
 				ManagedType.SIMPLE_NAME_TRANSFORMER
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
index d49d8f12b2..85f3b761f9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -316,7 +316,7 @@ public class JpaProjectPropertiesPage
 	}
 
 	private ModifiablePropertyValueModel<String> buildConnectionModel_() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.buildDataSourceModel(),
 				JpaDataSource.CONNECTION_PROFILE_NAME_PROPERTY,
 				JpaDataSource.CONNECTION_PROFILE_NAME_TRANSFORMER,
@@ -348,7 +348,7 @@ public class JpaProjectPropertiesPage
 	 * (used to enable the "Connect" link)
 	 */
 	private PropertyValueModel<Boolean> buildDisconnectedModel() {
-		return PropertyValueModelTools.aspectAdapter(
+		return PropertyValueModelTools.subjectModelAspectAdapter(
 				this.connectionProfileModel,
 				new ConnectionProfilePropertyAspectAdapter.Factory<>(TransformerTools.adapt(ConnectionProfile.DISCONNECTED_PREDICATE))
 			);
@@ -375,7 +375,7 @@ public class JpaProjectPropertiesPage
 	}
 
 	private ModifiablePropertyValueModel<String> buildUserOverrideDefaultCatalogModel_() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.jpaProjectModel,
 				JpaProject.USER_OVERRIDE_DEFAULT_CATALOG_PROPERTY,
 				JpaProject.USER_OVERRIDE_DEFAULT_CATALOG_TRANSFORMER,
@@ -399,7 +399,7 @@ public class JpaProjectPropertiesPage
 	 * Database-determined default catalog
 	 */
 	private PropertyValueModel<String> buildDatabaseDefaultCatalogModel() {
-		return PropertyValueModelTools.aspectAdapter(
+		return PropertyValueModelTools.subjectModelAspectAdapter(
 				this.connectionProfileModel,
 				new ConnectionProfilePropertyAspectAdapter.Factory<>(CONNECTION_PROFILE_DATABASE_DEFAULT_CATALOG_TRANSFORMER)
 			);
@@ -450,7 +450,7 @@ public class JpaProjectPropertiesPage
 	}
 
 	private ModifiablePropertyValueModel<String> buildUserOverrideDefaultSchemaModel_() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.jpaProjectModel,
 				JpaProject.USER_OVERRIDE_DEFAULT_SCHEMA_PROPERTY,
 				JpaProject.USER_OVERRIDE_DEFAULT_SCHEMA_TRANSFORMER,
@@ -505,7 +505,7 @@ public class JpaProjectPropertiesPage
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildDiscoverAnnotatedClassesModel_() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableBooleanSubjectModelAspectAdapter(
 				this.jpaProjectModel,
 				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PROPERTY,
 				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PREDICATE,
@@ -540,7 +540,7 @@ public class JpaProjectPropertiesPage
 	 * The folder where the source for the generated Canonical Metamodel is written.
 	 */
 	private ModifiablePropertyValueModel<String> buildMetamodelSourceFolderModel_() {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				this.jpaProject2_0Model,
 				JpaProject2_0.METAMODEL_SOURCE_FOLDER_NAME_PROPERTY,
 				JpaProject2_0.METAMODEL_SOURCE_FOLDER_NAME_TRANSFORMER,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java
index a04b6285d0..e299f9312a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java
@@ -69,7 +69,7 @@ public abstract class MappingStructureItemLabelProviderFactory
 	}
 	
 	protected static PropertyValueModel<TypeMapping> buildPersistentTypeMappingModel(PersistentType persistentType) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistentType,
 				PersistentType.MAPPING_PROPERTY,
 				PersistentType.MAPPING_TRANSFORMER
@@ -101,7 +101,7 @@ public abstract class MappingStructureItemLabelProviderFactory
 	}
 
 	protected static PropertyValueModel<String> buildPersistentTypeTextModel(PersistentType persistentType) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistentType,
 				ManagedType.TYPE_QUALIFIED_NAME_PROPERTY,
 				ManagedType.TYPE_QUALIFIED_NAME_TRANSFORMER
@@ -136,7 +136,7 @@ public abstract class MappingStructureItemLabelProviderFactory
 	}
 
 	protected static PropertyValueModel<AttributeMapping> buildPersistentAttributeMappingModel(PersistentAttribute persistentAttribute) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistentAttribute,
 				PersistentAttribute.MAPPING_PROPERTY,
 				PersistentAttribute.MAPPING_TRANSFORMER
@@ -168,7 +168,7 @@ public abstract class MappingStructureItemLabelProviderFactory
 	}
 
 	protected static PropertyValueModel<String> buildPersistentAttributeTextModel(PersistentAttribute persistentAttribute) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistentAttribute,
 				PersistentAttribute.NAME_PROPERTY,
 				PersistentAttribute.NAME_TRANSFORMER
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
index de3ba9d0aa..77edf64001 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java
@@ -117,7 +117,7 @@ public class PersistenceStructureItemLabelProviderFactory
 	}
 
 	protected static PropertyValueModel<String> buildPersistenceUnitTextModel(PersistenceUnit persistenceUnit) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistenceUnit,
 				PersistenceUnit.NAME_PROPERTY,
 				PersistenceUnit.NAME_TRANSFORMER
@@ -125,7 +125,7 @@ public class PersistenceStructureItemLabelProviderFactory
 	}
 
 	protected static PropertyValueModel<String> buildPersistenceUnitDescriptionModel(PersistenceUnit persistenceUnit) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				persistenceUnit,
 				PersistenceUnit.NAME_PROPERTY,
 				PERSISTENT_UNIT_DESCRIPTION_TRANSFORMER
@@ -165,7 +165,7 @@ public class PersistenceStructureItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<String> buildMappingFileRefTextModel(MappingFileRef mappingFileRef) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				mappingFileRef,
 				MappingFileRef.FILE_NAME_PROPERTY,
 				MappingFileRef.FILE_NAME_TRANSFORMER
@@ -196,7 +196,7 @@ public class PersistenceStructureItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<String> buildClassRefTextModel(ClassRef classRef) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				classRef,
 				ClassRef.CLASS_NAME_PROPERTY,
 				ClassRef.CLASS_NAME_TRANSFORMER
@@ -228,7 +228,7 @@ public class PersistenceStructureItemLabelProviderFactory
 	}
 
 	protected PropertyValueModel<String> buildJarFileRefTextModel(JarFileRef jarFileRef) {
-		return PropertyValueModelTools.modelAspectAdapter(
+		return PropertyValueModelTools.subjectAspectAdapter(
 				jarFileRef,
 				JarFileRef.FILE_NAME_PROPERTY,
 				JarFileRef.FILE_NAME_TRANSFORMER
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
index cd32100abc..55944daa30 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -603,7 +603,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
-		assertEquals(true, basicMapping.isDefaultOptional());
+		assertEquals(true, basicMapping.getDefaultOptional());
 	}
 	
 	public void testSpecifiedBasicGetDefaultOptional() throws Exception {
@@ -612,7 +612,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping();
-		assertEquals(true, basicMapping.isDefaultOptional());
+		assertEquals(true, basicMapping.getDefaultOptional());
 	}
 	
 	public void testGetOptional() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java
index dcca4ac9df..2e0d803a76 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -574,10 +574,10 @@ public class JavaColumnTests extends ContextModelTestCase
 		
 		BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping();
 
-		assertEquals(BaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().isDefaultUnique());
+		assertEquals(BaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().getDefaultUnique());
 		basicMapping.getColumn().setSpecifiedUnique(Boolean.TRUE);
 		
-		assertEquals(BaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().isDefaultUnique());
+		assertEquals(BaseColumn.DEFAULT_UNIQUE, basicMapping.getColumn().getDefaultUnique());
 	}	
 	
 	public void testGetSpecifiedUnique() throws Exception {
@@ -642,10 +642,10 @@ public class JavaColumnTests extends ContextModelTestCase
 		
 		BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping();
 
-		assertEquals(BaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().isDefaultInsertable());
+		assertEquals(BaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().getDefaultInsertable());
 		basicMapping.getColumn().setSpecifiedInsertable(Boolean.TRUE);
 		
-		assertEquals(BaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().isDefaultInsertable());
+		assertEquals(BaseColumn.DEFAULT_INSERTABLE, basicMapping.getColumn().getDefaultInsertable());
 	}	
 	
 	public void testGetSpecifiedInsertable() throws Exception {
@@ -710,10 +710,10 @@ public class JavaColumnTests extends ContextModelTestCase
 		
 		BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping();
 
-		assertEquals(BaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().isDefaultNullable());
+		assertEquals(BaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().getDefaultNullable());
 		basicMapping.getColumn().setSpecifiedNullable(Boolean.TRUE);
 		
-		assertEquals(BaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().isDefaultNullable());
+		assertEquals(BaseColumn.DEFAULT_NULLABLE, basicMapping.getColumn().getDefaultNullable());
 	}	
 	
 	public void testGetSpecifiedNullable() throws Exception {
@@ -778,10 +778,10 @@ public class JavaColumnTests extends ContextModelTestCase
 		
 		BasicMapping basicMapping = (BasicMapping) getJavaPersistentType().getAttributes().iterator().next().getMapping();
 
-		assertEquals(BaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().isDefaultUpdatable());
+		assertEquals(BaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().getDefaultUpdatable());
 		basicMapping.getColumn().setSpecifiedUpdatable(Boolean.TRUE);
 		
-		assertEquals(BaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().isDefaultUpdatable());
+		assertEquals(BaseColumn.DEFAULT_UPDATABLE, basicMapping.getColumn().getDefaultUpdatable());
 	}	
 	
 	public void testGetSpecifiedUpdatable() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
index d89ab9928d..f4d8683109 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -414,10 +414,10 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("foo", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
@@ -499,7 +499,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		assertNull(ormBasicMapping.getSpecifiedFetch());
 		assertNull(ormBasicMapping.getSpecifiedOptional());
 		assertEquals(FetchType.EAGER, ormBasicMapping.getDefaultFetch());
-		assertEquals(true, ormBasicMapping.isDefaultOptional());
+		assertEquals(true, ormBasicMapping.getDefaultOptional());
 		
 		OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn();
 		assertNull(ormColumn.getSpecifiedName());
@@ -514,10 +514,10 @@ public class OrmBasicMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("id", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java
index fb3ce08ad6..3b1e5af7fe 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -774,10 +774,10 @@ public class OrmColumnTests extends ContextModelTestCase
 	
 		assertEquals("name", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddableTests.java
index cc4a97aecf..80e425eb22 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddableTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddableTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -163,18 +163,18 @@ public class OrmEmbeddableTests extends ContextModelTestCase
 		OrmEmbeddable ormEmbeddable = (OrmEmbeddable) ormPersistentType.getMapping();
 		XmlEmbeddable embeddableResource = getXmlEntityMappings().getEmbeddables().get(0);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertFalse(ormEmbeddable.isOverrideMetadataComplete());
+		assertFalse(ormEmbeddable.getOverrideMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
 		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertTrue(ormEmbeddable.isOverrideMetadataComplete());
+		assertTrue(ormEmbeddable.getOverrideMetadataComplete());
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 		
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormEmbeddable.getSpecifiedMetadataComplete());
-		assertFalse(ormEmbeddable.isOverrideMetadataComplete());
+		assertFalse(ormEmbeddable.getOverrideMetadataComplete());
 		assertNull(embeddableResource.getMetadataComplete());
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java
index 3e547137f8..612c741b9b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEntityTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -611,24 +611,24 @@ public class OrmEntityTests extends ContextModelTestCase
 		OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping();
 		XmlEntity entityResource = getXmlEntityMappings().getEntities().get(0);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
-		assertFalse(ormEntity.isOverrideMetadataComplete());
+		assertFalse(ormEntity.getOverrideMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
 		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertTrue(ormEntity.isOverrideMetadataComplete());
+		assertTrue(ormEntity.getOverrideMetadataComplete());
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormEntity.getSpecifiedMetadataComplete());
-		assertFalse(ormEntity.isOverrideMetadataComplete());
+		assertFalse(ormEntity.getOverrideMetadataComplete());
 		assertNull(entityResource.getMetadataComplete());
 		
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
 		ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, ormEntity.getSpecifiedMetadataComplete());
-		assertTrue(ormEntity.isOverrideMetadataComplete());
+		assertTrue(ormEntity.getOverrideMetadataComplete());
 		assertTrue(ormEntity.isMetadataComplete());
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
index 4827431f07..ededf8d35b 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -451,10 +451,10 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("foo", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
@@ -540,10 +540,10 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		
 		OrmSpecifiedColumn ormColumn = ormIdMapping.getColumn();
 		assertEquals("id", ormColumn.getName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertNull(ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getTableName());
 		assertEquals(255, ormColumn.getLength());
@@ -580,10 +580,10 @@ public class OrmIdMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("id", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
index e1baf97a47..4a706acd0f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -546,7 +546,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();	
 		assertEquals("address", ormManyToOneMapping.getName());
 		assertEquals(FetchType.EAGER, ormManyToOneMapping.getDefaultFetch());
-		assertEquals(true, ormManyToOneMapping.isDefaultOptional());
+		assertEquals(true, ormManyToOneMapping.getDefaultOptional());
 		//TODO hmm, is this correct?
 		assertEquals("test.Address", ormManyToOneMapping.getDefaultTargetEntity());
 		
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
index 14cfe9791e..e4d607b36d 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmMappedSuperclassTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -178,18 +178,18 @@ public class OrmMappedSuperclassTests extends ContextModelTestCase
 		XmlMappedSuperclass mappedSuperclassResource = getXmlEntityMappings().getMappedSuperclasses().get(0);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
-		assertFalse(ormMappedSuperclass.isOverrideMetadataComplete());
+		assertFalse(ormMappedSuperclass.getOverrideMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
 		getXmlEntityMappings().setPersistenceUnitMetadata(OrmFactory.eINSTANCE.createXmlPersistenceUnitMetadata());
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertTrue(ormMappedSuperclass.isOverrideMetadataComplete());
+		assertTrue(ormMappedSuperclass.getOverrideMetadataComplete());
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 		
 		getXmlEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false);
 		assertNull(ormMappedSuperclass.getSpecifiedMetadataComplete());
-		assertFalse(ormMappedSuperclass.isOverrideMetadataComplete());
+		assertFalse(ormMappedSuperclass.getOverrideMetadataComplete());
 		assertNull(mappedSuperclassResource.getMetadataComplete());
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
index f8fcd56dc9..e30f62dedf 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -207,10 +207,10 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("foo", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
@@ -269,10 +269,10 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		
 		OrmSpecifiedColumn ormColumn = ormVersionMapping.getColumn();
 		assertEquals("id", ormColumn.getName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertNull(ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getTableName());
 		assertEquals(255, ormColumn.getLength());
@@ -306,10 +306,10 @@ public class OrmVersionMappingTests extends ContextModelTestCase
 		assertNull(ormColumn.getSpecifiedScale());
 		
 		assertEquals("id", ormColumn.getDefaultName());
-		assertEquals(false, ormColumn.isDefaultUnique());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
+		assertEquals(false, ormColumn.getDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
 		assertEquals(null, ormColumn.getColumnDefinition());
 		assertEquals(TYPE_NAME, ormColumn.getDefaultTableName());
 		assertEquals(255, ormColumn.getDefaultLength());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java
index beca548932..7cad7d5bfe 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEntity2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1984,19 +1984,19 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaEntity()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit2_0 = (PersistenceUnit2_0) getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.UNSPECIFIED, persistenceUnit2_0.getSharedCacheMode());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testInheritedIsDefaultCacheable() throws Exception {
@@ -2008,25 +2008,25 @@ public class GenericJavaEntity2_0Tests extends Generic2_0ContextModelTestCase
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) getJavaEntity()).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaEntity().getParentEntity()).getCacheable();
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = (PersistenceUnit2_0) getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 	
 	//This is a test for bug 301892
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
index 4471fd3022..39c2c8b083 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2013 Oracle. All rights reserved.
+* Copyright (c) 2009, 2016 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -731,7 +731,7 @@ public class GenericJavaOneToManyMapping2_0Tests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testSpecifiedOneToManyGetDefaultOrphanRemoval() throws Exception {
@@ -740,7 +740,7 @@ public class GenericJavaOneToManyMapping2_0Tests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testGetOrphanRemoval() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java
index b52305e6c2..baab2f2af6 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -841,7 +841,7 @@ public class GenericJavaOneToOneMapping2_0Tests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testSpecifiedOneToOneGetDefaultOrphanRemoval() throws Exception {
@@ -850,7 +850,7 @@ public class GenericJavaOneToOneMapping2_0Tests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testGetOrphanRemoval() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
index 75e1659caf..8206a8b04f 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1070,10 +1070,10 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 	
 		assertEquals("addresses", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_addresses", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
@@ -1426,10 +1426,10 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_addresses", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java
index a2eccfe7f4..9bed875f8d 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEntity2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1851,19 +1851,19 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
 		Cacheable2_0 cacheable = ((CacheableReference2_0) ormPersistentType.getMapping()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit2_0 = (PersistenceUnit2_0) getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.UNSPECIFIED, persistenceUnit2_0.getSharedCacheMode());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromSuperType() throws Exception {
@@ -1875,25 +1875,25 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) subOrmPersistentType.getMapping()).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) ormPersistentType.getMapping()).getCacheable();
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = (PersistenceUnit2_0) getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromJava() throws Exception {
@@ -1907,37 +1907,37 @@ public class GenericOrmEntity2_0Tests extends Generic2_0ContextModelTestCase
 		
 		Cacheable2_0 javaCacheable = ((CacheableReference2_0) ormPersistentType.getJavaPersistentType().getMapping()).getCacheable();
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = (PersistenceUnit2_0) getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	//This is a test for bug 301892
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
index cb9185dad4..8f3d54a5fe 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -836,10 +836,10 @@ public class GenericOrmManyToManyMapping2_0Tests
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_Address", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java
index 601a43a375..579c43aea7 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -657,7 +657,7 @@ public class GenericOrmManyToOneMapping2_0Tests
 		OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping();	
 		assertEquals("address", ormManyToOneMapping.getName());
 		assertEquals(FetchType.EAGER, ormManyToOneMapping.getDefaultFetch());
-		assertEquals(true, ormManyToOneMapping.isDefaultOptional());
+		assertEquals(true, ormManyToOneMapping.getDefaultOptional());
 		assertEquals("test.Address", ormManyToOneMapping.getDefaultTargetEntity());
 
 		Cascade2_0 cascade = (Cascade2_0) ormManyToOneMapping.getCascade();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
index 5f46bf337c..e484d73b60 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -859,10 +859,10 @@ public class GenericOrmOneToManyMapping2_0Tests
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_Address", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaEntityTests.java
index ea87b894d1..198b610969 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaEntityTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1733,22 +1733,22 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaEntity()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit = getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.DISABLE_SELECTIVE, persistenceUnit.getSharedCacheMode());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.UNSPECIFIED);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testInheritedIsDefaultCacheable() throws Exception {
@@ -1759,39 +1759,39 @@ public class EclipseLink2_0JavaEntityTests extends EclipseLink2_0ContextModelTes
 		
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) getJavaEntity()).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaEntity().getParentEntity()).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaMappedSuperclassTests.java
index bee4e968b0..487ecfcb29 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaMappedSuperclassTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -142,7 +142,7 @@ public class EclipseLink2_0JavaMappedSuperclassTests extends EclipseLink2_0Conte
 		
 		EclipseLinkMappedSuperclass mappedSuperclass = (EclipseLinkMappedSuperclass) getJavaPersistentType().getMapping();
 		EclipseLinkReadOnly readOnly = mappedSuperclass.getReadOnly();
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 	}
 
 	public void testSetSpecifiedReadOnly() throws Exception {
@@ -182,7 +182,7 @@ public class EclipseLink2_0JavaMappedSuperclassTests extends EclipseLink2_0Conte
 		getJpaProject().synchronizeContextModel();
 		
 		assertEquals(null, readOnly.getSpecifiedReadOnly());
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 		
 		resourceType.addAnnotation(ReadOnlyAnnotation.ANNOTATION_NAME);
 		getJpaProject().synchronizeContextModel();
@@ -465,22 +465,22 @@ public class EclipseLink2_0JavaMappedSuperclassTests extends EclipseLink2_0Conte
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaPersistentType().getMapping()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit = getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.DISABLE_SELECTIVE, persistenceUnit.getSharedCacheMode());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit.setSpecifiedSharedCacheMode(SharedCacheMode2_0.UNSPECIFIED);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testInheritedIsDefaultCacheable() throws Exception {
@@ -491,39 +491,39 @@ public class EclipseLink2_0JavaMappedSuperclassTests extends EclipseLink2_0Conte
 		
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) getJavaPersistentType().getMapping()).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) getJavaPersistentType().getSuperPersistentType().getMapping()).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
index 4a9417453d..f44b563271 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2013 Oracle. All rights reserved.
+* Copyright (c) 2009, 2016 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -337,7 +337,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testSpecifiedOneToManyGetDefaultOrphanRemoval() throws Exception {
@@ -346,7 +346,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testGetOrphanRemoval() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java
index e079300d7a..483292d038 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -510,7 +510,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testSpecifiedOneToOneGetDefaultOrphanRemoval() throws Exception {
@@ -519,7 +519,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests
 		
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping();
-		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval());
+		assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).getDefaultOrphanRemoval());
 	}
 	
 	public void testGetOrphanRemoval() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
index abce952f46..efa3eb6a1a 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_3JavaMultitenancyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -520,30 +520,30 @@ public class EclipseLink2_3JavaMultitenancyTests extends EclipseLink2_3ContextMo
 
 		EclipseLinkJavaMultitenancy2_3 multitenancy = getJavaMultitenancy();
 		assertTrue(multitenancy.isMultitenant()); //multitenant by default from root entity
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("ROOT_ENTITY_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());
 
 		getJavaEntity().getRootEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED);
 		assertTrue(multitenancy.isMultitenant()); //multitenant by default from root entity
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("ROOT_ENTITY_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());
 
 		getJavaEntity().getRootEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
 		assertFalse(multitenancy.isMultitenant()); //not multitenant since inheritance strategy is table per class
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(0, multitenancy.getTenantDiscriminatorColumnsSize());
 
 		EclipseLinkPersistenceUnitDefaults persistenceUnitDefaults = (EclipseLinkPersistenceUnitDefaults) getMappingFile().getRoot().getPersistenceUnitMetadata().getPersistenceUnitDefaults();
 		persistenceUnitDefaults.addTenantDiscriminatorColumn().setSpecifiedName("PU_TENANT_ID");
 		assertFalse(multitenancy.isMultitenant()); //not multitenant since inheritance strategy is table per class
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(0, multitenancy.getTenantDiscriminatorColumnsSize());
 
 		//get the default tenant discriminator column from the persistence unit defaults instead of the root entity since inheritance strategy is table per class
 		multitenancy.setSpecifiedMultitenant(true);
-		assertTrue(multitenancy.isSpecifiedMultitenant());
+		assertTrue(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("PU_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());		
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java
index 75bee5d281..dfc3c9df60 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -260,19 +260,19 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = basicMapping.getMutable();
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.FALSE);	
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 	}
 	
 	public void testIsDefaultMutableForDate() throws Exception {
@@ -282,25 +282,25 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = basicMapping.getMutable();
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.TRUE);	
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(null);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 	}
 	
 	public void testIsMutable() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaEntityTests.java
index 7536414fad..851160ce7e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaEntityTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -337,7 +337,7 @@ public class EclipseLinkJavaEntityTests extends EclipseLinkContextModelTestCase
 		
 		EclipseLinkEntity mappedSuperclass = (EclipseLinkEntity) getJavaPersistentType().getMapping();
 		EclipseLinkReadOnly readOnly = mappedSuperclass.getReadOnly();
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 	}
 
 	public void testSetSpecifiedReadOnly() throws Exception {
@@ -377,7 +377,7 @@ public class EclipseLinkJavaEntityTests extends EclipseLinkContextModelTestCase
 		getJpaProject().synchronizeContextModel();
 		
 		assertNull(readOnly.getSpecifiedReadOnly());
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 		
 		resourceType.addAnnotation(ReadOnlyAnnotation.ANNOTATION_NAME);
 		getJpaProject().synchronizeContextModel();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java
index b19f93713b..04b777336e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -261,19 +261,19 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = idMapping.getMutable();
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.FALSE);	
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 	}
 	
 	public void testIsDefaultMutableForDate() throws Exception {
@@ -283,25 +283,25 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = idMapping.getMutable();
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.TRUE);	
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(null);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 	}
 	
 	public void testIsMutable() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaMappedSuperclassTests.java
index 25f14f3c61..efc9a64db0 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaMappedSuperclassTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -102,7 +102,7 @@ public class EclipseLinkJavaMappedSuperclassTests extends EclipseLinkContextMode
 		
 		EclipseLinkMappedSuperclass mappedSuperclass = (EclipseLinkMappedSuperclass) getJavaPersistentType().getMapping();
 		EclipseLinkReadOnly readOnly = mappedSuperclass.getReadOnly();
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 	}
 
 	public void testSetSpecifiedReadOnly() throws Exception {
@@ -142,7 +142,7 @@ public class EclipseLinkJavaMappedSuperclassTests extends EclipseLinkContextMode
 		getJpaProject().synchronizeContextModel();
 		
 		assertNull(readOnly.getSpecifiedReadOnly());
-		assertEquals(false, readOnly.isDefaultReadOnly());
+		assertEquals(false, readOnly.getDefaultReadOnly());
 		
 		resourceType.addAnnotation(ReadOnlyAnnotation.ANNOTATION_NAME);
 		getJpaProject().synchronizeContextModel();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java
index c6acec5bee..40fbd9532e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -260,19 +260,19 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = versionMapping.getMutable();
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.FALSE);	
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 	}
 	
 	public void testIsDefaultMutableForDate() throws Exception {
@@ -282,25 +282,25 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT
 		SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next();
 		EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping();
 		EclipseLinkMutable mutable = versionMapping.getMutable();
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE);
 		JavaResourceField resourceField = resourceType.getFields().iterator().next();
 		resourceField.removeAnnotation(MutableAnnotation.ANNOTATION_NAME);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		mutable.setSpecifiedMutable(Boolean.TRUE);	
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		//set mutable default to false in the persistence unit properties, verify default in java still true since this is not a Date/Calendar
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
-		assertTrue(mutable.isDefaultMutable());
+		assertTrue(mutable.getDefaultMutable());
 		
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 		
 		(getPersistenceUnit()).getEclipseLinkOptions().setTemporalMutable(null);
-		assertFalse(mutable.isDefaultMutable());
+		assertFalse(mutable.getDefaultMutable());
 	}
 	
 	public void testIsMutable() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
index 4875602032..da98fc970e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1098,10 +1098,10 @@ public class EclipseLink2_0OrmElementCollectionMappingTests
 	
 		assertEquals("addresses", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_addresses", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
@@ -1452,10 +1452,10 @@ public class EclipseLink2_0OrmElementCollectionMappingTests
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_addresses", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmEntityTests.java
index 311949b7d2..d164fe7f4e 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmEntityTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -1654,22 +1654,22 @@ public class EclipseLink2_0OrmEntityTests
 		Cacheable2_0 cacheable = ((CacheableReference2_0) ormPersistentType.getMapping()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.DISABLE_SELECTIVE, persistenceUnit2_0.getSharedCacheMode());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.UNSPECIFIED);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromSuperType() throws Exception {
@@ -1682,38 +1682,38 @@ public class EclipseLink2_0OrmEntityTests
 		EclipseLinkEntity entity = (EclipseLinkEntity) ormPersistentType.getMapping();
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) subEntity).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) entity).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromJava() throws Exception {
@@ -1727,37 +1727,37 @@ public class EclipseLink2_0OrmEntityTests
 		
 		Cacheable2_0 javaCacheable = ((CacheableReference2_0) ormPersistentType.getJavaPersistentType().getMapping()).getCacheable();
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromMappedSuperClass() throws Exception {
@@ -1770,38 +1770,38 @@ public class EclipseLink2_0OrmEntityTests
 		EclipseLinkMappedSuperclass mappedSuperclass = (EclipseLinkMappedSuperclass) ormPersistentType.getMapping();
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) subEntity).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) mappedSuperclass).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
index ce85526eb5..9ef22dd4d5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -869,10 +869,10 @@ public class EclipseLink2_0OrmManyToManyMappingTests
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_Address", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java
index 8478784998..38d03c9de7 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -571,7 +571,7 @@ public class EclipseLink2_0OrmManyToOneMappingTests
 		ManyToOneMapping2_0 ormManyToOneMapping = (ManyToOneMapping2_0) ormPersistentAttribute.getMapping();	
 		assertEquals("address", ormManyToOneMapping.getName());
 		assertEquals(FetchType.EAGER, ormManyToOneMapping.getDefaultFetch());
-		assertEquals(true, ormManyToOneMapping.isDefaultOptional());
+		assertEquals(true, ormManyToOneMapping.getDefaultOptional());
 		assertEquals("test.Address", ormManyToOneMapping.getDefaultTargetEntity());
 
 		Cascade2_0 cascade = (Cascade2_0) ormManyToOneMapping.getCascade();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java
index 1f146366b2..f9e99e79e6 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmMappedSuperclassTests.java
@@ -195,7 +195,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to false, check override
@@ -205,7 +205,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -215,7 +215,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// clear xml read only, set java read only to true, check defaults
@@ -226,7 +226,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set metadataComplete to True, check defaults not from java
@@ -236,7 +236,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 
 		ormContextMappedSuperclass.setSpecifiedMetadataComplete(null);
@@ -248,7 +248,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -258,7 +258,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// clear xml read only, set java read only to false, check defaults
@@ -269,7 +269,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to false, check override
@@ -279,7 +279,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -289,7 +289,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 	}
 	
@@ -303,7 +303,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to true, check resource
@@ -312,7 +312,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to false, check resource
@@ -321,7 +321,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to null, check resource
@@ -330,7 +330,7 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());	
 	}
 	
@@ -2218,22 +2218,22 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		Cacheable2_0 cacheable = ((CacheableReference2_0) ormPersistentType.getMapping()).getCacheable();
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		assertEquals(SharedCacheMode2_0.DISABLE_SELECTIVE, persistenceUnit2_0.getSharedCacheMode());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ALL);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.UNSPECIFIED);
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromSuperType() throws Exception {
@@ -2246,38 +2246,38 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		EclipseLinkMappedSuperclass mappedSuperclass = (EclipseLinkMappedSuperclass) ormPersistentType.getMapping();
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) subMappedSuperclass).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) mappedSuperclass).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromJava() throws Exception {
@@ -2291,37 +2291,37 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		
 		Cacheable2_0 javaCacheable = ((CacheableReference2_0) ormPersistentType.getJavaPersistentType().getMapping()).getCacheable();
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		javaCacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 	}
 	
 	public void testIsDefaultCacheableFromMappedSuperClass() throws Exception {
@@ -2334,37 +2334,37 @@ public class EclipseLink2_0OrmMappedSuperclassTests
 		EclipseLinkMappedSuperclass mappedSuperclass = (EclipseLinkMappedSuperclass) ormPersistentType.getMapping();
 		Cacheable2_0 subCacheable = ((CacheableReference2_0) subMappedSuperclass).getCacheable();
 		Cacheable2_0 cacheable = ((CacheableReference2_0) mappedSuperclass).getCacheable();
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		PersistenceUnit2_0 persistenceUnit2_0 = getPersistenceUnit();
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(null);
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.DISABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 				
 		cacheable.setSpecifiedCacheable(Boolean.FALSE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(true, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(true, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.ENABLE_SELECTIVE);
-		assertEquals(false, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(false, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		cacheable.setSpecifiedCacheable(Boolean.TRUE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 		
 		persistenceUnit2_0.setSpecifiedSharedCacheMode(SharedCacheMode2_0.NONE);
-		assertEquals(true, subCacheable.isDefaultCacheable());
-		assertEquals(false, cacheable.isDefaultCacheable());
+		assertEquals(true, subCacheable.getDefaultCacheable());
+		assertEquals(false, cacheable.getDefaultCacheable());
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
index 591aba4adb..4dbeab8826 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009, 2013 Oracle. All rights reserved.
+* Copyright (c) 2009, 2016 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -729,10 +729,10 @@ public class EclipseLink2_0OrmOneToManyMappingTests
 
 		assertEquals("addresses_KEY", ormColumn.getDefaultName());
 		assertEquals(TYPE_NAME + "_Address", ormColumn.getDefaultTableName());
-		assertEquals(true, ormColumn.isDefaultInsertable());
-		assertEquals(true, ormColumn.isDefaultUpdatable());
-		assertEquals(true, ormColumn.isDefaultNullable());
-		assertEquals(false, ormColumn.isDefaultUnique());
+		assertEquals(true, ormColumn.getDefaultInsertable());
+		assertEquals(true, ormColumn.getDefaultUpdatable());
+		assertEquals(true, ormColumn.getDefaultNullable());
+		assertEquals(false, ormColumn.getDefaultUnique());
 		assertEquals(Column.DEFAULT_LENGTH, ormColumn.getDefaultLength());
 		assertEquals(Column.DEFAULT_PRECISION, ormColumn.getDefaultPrecision());
 		assertEquals(Column.DEFAULT_SCALE, ormColumn.getDefaultScale());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
index 176b96424c..57ce40e981 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_3OrmMultitenancyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -428,30 +428,30 @@ public class EclipseLink2_3OrmMultitenancyTests
 		
 		EclipseLinkOrmMultitenancy2_3 multitenancy = ((EclipseLinkOrmEntity) ormPersistentType.getMapping()).getMultitenancy();
 		assertTrue(multitenancy.isMultitenant()); //multitenant by default from root entity
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("ROOT_ENTITY_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());
 
 		ormEntity.getRootEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED);
 		assertTrue(multitenancy.isMultitenant()); //multitenant by default from root entity
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("ROOT_ENTITY_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());
 
 		ormEntity.getRootEntity().setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS);
 		assertFalse(multitenancy.isMultitenant()); //not multitenant since inheritance strategy is table per class
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(0, multitenancy.getTenantDiscriminatorColumnsSize());
 
 		EclipseLinkPersistenceUnitDefaults persistenceUnitDefaults = (EclipseLinkPersistenceUnitDefaults) getMappingFile().getRoot().getPersistenceUnitMetadata().getPersistenceUnitDefaults();
 		persistenceUnitDefaults.addTenantDiscriminatorColumn().setSpecifiedName("PU_TENANT_ID");
 		assertFalse(multitenancy.isMultitenant()); //not multitenant since inheritance strategy is table per class
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(0, multitenancy.getTenantDiscriminatorColumnsSize());
 
 		//get the default tenant discriminator column from the persistence unit defaults instead of the root entity since inheritance strategy is table per class
 		multitenancy.setSpecifiedMultitenant(true);
-		assertTrue(multitenancy.isSpecifiedMultitenant());
+		assertTrue(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("PU_TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());		
 
@@ -529,7 +529,7 @@ public class EclipseLink2_3OrmMultitenancyTests
 				
 		EclipseLinkOrmMultitenancy2_3 multitenancy = ((EclipseLinkOrmEntity) ormPersistentType.getMapping()).getMultitenancy();
 		assertTrue(multitenancy.isMultitenant()); //isMultitenant is true because the java entity specifies @Multitenant
-		assertFalse(multitenancy.isSpecifiedMultitenant());
+		assertFalse(multitenancy.getSpecifiedMultitenant());
 		assertEquals(1, multitenancy.getTenantDiscriminatorColumnsSize());
 		assertEquals("TENANT_ID", multitenancy.getTenantDiscriminatorColumns().iterator().next().getName());
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
index 15dfbdccdb..7873912472 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -95,7 +95,7 @@ public class EclipseLinkOrmBasicMappingTests
 		// check defaults
 		
 		assertNull(resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
@@ -104,7 +104,7 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -113,7 +113,7 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
@@ -122,7 +122,7 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(null);
 		
 		assertNull(resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
@@ -133,7 +133,7 @@ public class EclipseLinkOrmBasicMappingTests
 		
 		javaBasicMapping.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		assertNull(resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		assertFalse(javaBasicMapping.getMutable().isMutable());
@@ -145,7 +145,7 @@ public class EclipseLinkOrmBasicMappingTests
 		EclipseLinkBasicMapping virtualContextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceBasic.getMutable());
-		assertTrue(virtualContextBasic.getMutable().isDefaultMutable());
+		assertTrue(virtualContextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, virtualContextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(virtualContextBasic.getMutable().isMutable());
 		assertFalse(javaBasicMapping.getMutable().isMutable());
@@ -155,7 +155,7 @@ public class EclipseLinkOrmBasicMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("id");
 		virtualContextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceBasic.getMutable());
-		assertTrue(virtualContextBasic.getMutable().isDefaultMutable());
+		assertTrue(virtualContextBasic.getMutable().getDefaultMutable());
 		assertNull(virtualContextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(virtualContextBasic.getMutable().isMutable());
 		assertFalse(javaBasicMapping.getMutable().isMutable());
@@ -177,7 +177,7 @@ public class EclipseLinkOrmBasicMappingTests
 		// check defaults
 		
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -186,7 +186,7 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -195,7 +195,7 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
@@ -204,26 +204,26 @@ public class EclipseLinkOrmBasicMappingTests
 		resourceBasic.setMutable(null);
 		
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceBasic.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(null);
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -231,7 +231,7 @@ public class EclipseLinkOrmBasicMappingTests
 		
 		javaBasicMapping.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		assertTrue(javaBasicMapping.getMutable().isMutable());
@@ -243,7 +243,7 @@ public class EclipseLinkOrmBasicMappingTests
 		EclipseLinkBasicMapping virtualContextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceBasic.getMutable());
-		assertFalse(virtualContextBasic.getMutable().isDefaultMutable());
+		assertFalse(virtualContextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, virtualContextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(virtualContextBasic.getMutable().isMutable());
 		assertTrue(javaBasicMapping.getMutable().isMutable());
@@ -253,7 +253,7 @@ public class EclipseLinkOrmBasicMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("myDate");
 		virtualContextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceBasic.getMutable());
-		assertFalse(virtualContextBasic.getMutable().isDefaultMutable());
+		assertFalse(virtualContextBasic.getMutable().getDefaultMutable());
 		assertNull(virtualContextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(virtualContextBasic.getMutable().isMutable());
 		assertTrue(javaBasicMapping.getMutable().isMutable());
@@ -274,7 +274,7 @@ public class EclipseLinkOrmBasicMappingTests
 		// check defaults
 		
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -283,7 +283,7 @@ public class EclipseLinkOrmBasicMappingTests
 		contextBasic.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		
@@ -292,7 +292,7 @@ public class EclipseLinkOrmBasicMappingTests
 		contextBasic.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		
@@ -301,7 +301,7 @@ public class EclipseLinkOrmBasicMappingTests
 		contextBasic.getMutable().setSpecifiedMutable(null);
 		
 		assertNull(resourceBasic.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
index c57362d257..c8103186ed 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmEntityTests.java
@@ -169,7 +169,7 @@ public class EclipseLinkOrmEntityTests
 		assertNull(resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to false, check override
@@ -179,7 +179,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.FALSE, resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -189,7 +189,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.TRUE, resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertTrue(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// clear xml read only, set java read only to true, check defaults
@@ -200,7 +200,7 @@ public class EclipseLinkOrmEntityTests
 		assertNull(resourceEntity.getReadOnly());
 		assertTrue(javaContextEntity.getReadOnly().isReadOnly());
 		assertTrue(ormContextEntity.getReadOnly().isReadOnly());
-		assertTrue(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 
 		// set metadataComplete to True, check defaults not from java
@@ -210,7 +210,7 @@ public class EclipseLinkOrmEntityTests
 		assertNull(resourceEntity.getReadOnly());
 		assertTrue(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 
 		ormContextEntity.setSpecifiedMetadataComplete(null);
@@ -222,7 +222,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.FALSE, resourceEntity.getReadOnly());
 		assertTrue(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertTrue(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -232,7 +232,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.TRUE, resourceEntity.getReadOnly());
 		assertTrue(javaContextEntity.getReadOnly().isReadOnly());
 		assertTrue(ormContextEntity.getReadOnly().isReadOnly());
-		assertTrue(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 				
 		// clear xml read only, set java read only to false, check defaults
@@ -243,7 +243,7 @@ public class EclipseLinkOrmEntityTests
 		assertNull(resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		
@@ -255,7 +255,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.FALSE, resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -265,7 +265,7 @@ public class EclipseLinkOrmEntityTests
 		assertEquals(Boolean.TRUE, resourceEntity.getReadOnly());
 		assertFalse(javaContextEntity.getReadOnly().isReadOnly());
 		assertTrue(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 	}
 	
@@ -279,7 +279,7 @@ public class EclipseLinkOrmEntityTests
 		
 		assertNull(resourceEntity.getReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to true, check resource
@@ -288,7 +288,7 @@ public class EclipseLinkOrmEntityTests
 		
 		assertEquals(Boolean.TRUE, resourceEntity.getReadOnly());
 		assertTrue(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to false, check resource
@@ -297,7 +297,7 @@ public class EclipseLinkOrmEntityTests
 		
 		assertEquals(Boolean.FALSE, resourceEntity.getReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextEntity.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to null, check resource
@@ -306,7 +306,7 @@ public class EclipseLinkOrmEntityTests
 		
 		assertNull(resourceEntity.getReadOnly());
 		assertFalse(ormContextEntity.getReadOnly().isReadOnly());
-		assertFalse(ormContextEntity.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextEntity.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextEntity.getReadOnly().getSpecifiedReadOnly());	
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
index 2945910157..4825da0b1a 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -95,7 +95,7 @@ public class EclipseLinkOrmIdMappingTests
 		// check defaults
 		
 		assertNull(resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
@@ -104,7 +104,7 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -113,7 +113,7 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
@@ -122,7 +122,7 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(null);
 		
 		assertNull(resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
@@ -133,7 +133,7 @@ public class EclipseLinkOrmIdMappingTests
 		
 		javaIdMapping.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		assertNull(resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		assertFalse(javaIdMapping.getMutable().isMutable());
@@ -145,7 +145,7 @@ public class EclipseLinkOrmIdMappingTests
 		EclipseLinkIdMapping virtualIdMapping = (EclipseLinkIdMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceId.getMutable());
-		assertTrue(virtualIdMapping.getMutable().isDefaultMutable());
+		assertTrue(virtualIdMapping.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, virtualIdMapping.getMutable().getSpecifiedMutable());
 		assertFalse(virtualIdMapping.getMutable().isMutable());
 		assertFalse(javaIdMapping.getMutable().isMutable());
@@ -155,7 +155,7 @@ public class EclipseLinkOrmIdMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("id");
 		EclipseLinkBasicMapping virtualBasicMapping = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceId.getMutable());
-		assertTrue(virtualBasicMapping.getMutable().isDefaultMutable());
+		assertTrue(virtualBasicMapping.getMutable().getDefaultMutable());
 		assertNull(virtualBasicMapping.getMutable().getSpecifiedMutable());
 		assertTrue(virtualBasicMapping.getMutable().isMutable());
 		assertFalse(javaIdMapping.getMutable().isMutable());
@@ -178,7 +178,7 @@ public class EclipseLinkOrmIdMappingTests
 		// check defaults
 		
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -187,7 +187,7 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -196,7 +196,7 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
@@ -205,26 +205,26 @@ public class EclipseLinkOrmIdMappingTests
 		resourceId.setMutable(null);
 		
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceId.getMutable());
-		assertTrue(contextId.getMutable().isDefaultMutable());
+		assertTrue(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(null);
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -232,7 +232,7 @@ public class EclipseLinkOrmIdMappingTests
 		
 		javaIdMapping.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		assertTrue(javaIdMapping.getMutable().isMutable());
@@ -244,7 +244,7 @@ public class EclipseLinkOrmIdMappingTests
 		EclipseLinkIdMapping virtualIdMapping = (EclipseLinkIdMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceId.getMutable());
-		assertFalse(virtualIdMapping.getMutable().isDefaultMutable());
+		assertFalse(virtualIdMapping.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, virtualIdMapping.getMutable().getSpecifiedMutable());
 		assertTrue(virtualIdMapping.getMutable().isMutable());
 		assertTrue(javaIdMapping.getMutable().isMutable());
@@ -254,7 +254,7 @@ public class EclipseLinkOrmIdMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("myDate");
 		EclipseLinkBasicMapping virtualBasicMapping = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceId.getMutable());
-		assertFalse(virtualBasicMapping.getMutable().isDefaultMutable());
+		assertFalse(virtualBasicMapping.getMutable().getDefaultMutable());
 		assertNull(virtualBasicMapping.getMutable().getSpecifiedMutable());
 		assertFalse(virtualBasicMapping.getMutable().isMutable());
 		assertTrue(javaIdMapping.getMutable().isMutable());
@@ -275,7 +275,7 @@ public class EclipseLinkOrmIdMappingTests
 		// check defaults
 		
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -284,7 +284,7 @@ public class EclipseLinkOrmIdMappingTests
 		contextId.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextId.getMutable().getSpecifiedMutable());
 		assertTrue(contextId.getMutable().isMutable());
 		
@@ -293,7 +293,7 @@ public class EclipseLinkOrmIdMappingTests
 		contextId.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 		
@@ -302,7 +302,7 @@ public class EclipseLinkOrmIdMappingTests
 		contextId.getMutable().setSpecifiedMutable(null);
 		
 		assertNull(resourceId.getMutable());
-		assertFalse(contextId.getMutable().isDefaultMutable());
+		assertFalse(contextId.getMutable().getDefaultMutable());
 		assertNull(contextId.getMutable().getSpecifiedMutable());
 		assertFalse(contextId.getMutable().isMutable());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
index f36f44c2b5..100a672294 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -316,7 +316,7 @@ public class EclipseLinkOrmManyToOneMappingTests
 		EclipseLinkOrmManyToOneMapping ormManyToOneMapping = (EclipseLinkOrmManyToOneMapping) ormPersistentAttribute.getMapping();	
 		assertEquals("address", ormManyToOneMapping.getName());
 		assertEquals(FetchType.EAGER, ormManyToOneMapping.getDefaultFetch());
-		assertEquals(true, ormManyToOneMapping.isDefaultOptional());
+		assertEquals(true, ormManyToOneMapping.getDefaultOptional());
 		assertEquals("test.Address", ormManyToOneMapping.getDefaultTargetEntity());
 
 		Cascade cascade = ormManyToOneMapping.getCascade();
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
index 4960cd5d17..ad643a6a87 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmMappedSuperclassTests.java
@@ -168,7 +168,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to false, check override
@@ -178,7 +178,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -188,7 +188,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// clear xml read only, set java read only to true, check defaults
@@ -199,7 +199,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set metadataComplete to True, check defaults not from java
@@ -209,7 +209,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 
 		ormContextMappedSuperclass.setSpecifiedMetadataComplete(null);
@@ -221,7 +221,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -231,7 +231,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertTrue(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertTrue(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// clear xml read only, set java read only to false, check defaults
@@ -242,7 +242,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to false, check override
@@ -252,7 +252,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set xml read only to true, check override
@@ -262,7 +262,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(javaContextMappedSuperclass.getReadOnly().isReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 	}
 	
@@ -276,7 +276,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to true, check resource
@@ -285,7 +285,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		
 		assertEquals(Boolean.TRUE, resourceMappedSuperclass.getReadOnly());
 		assertTrue(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.TRUE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to false, check resource
@@ -294,7 +294,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		
 		assertEquals(Boolean.FALSE, resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertEquals(Boolean.FALSE, ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());
 		
 		// set context read only to null, check resource
@@ -303,7 +303,7 @@ public class EclipseLinkOrmMappedSuperclassTests
 		
 		assertNull(resourceMappedSuperclass.getReadOnly());
 		assertFalse(ormContextMappedSuperclass.getReadOnly().isReadOnly());
-		assertFalse(ormContextMappedSuperclass.getReadOnly().isDefaultReadOnly());
+		assertFalse(ormContextMappedSuperclass.getReadOnly().getDefaultReadOnly());
 		assertNull(ormContextMappedSuperclass.getReadOnly().getSpecifiedReadOnly());	
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
index 9021c89a67..9cc53381e4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -96,7 +96,7 @@ public class EclipseLinkOrmVersionMappingTests
 		// check defaults
 		
 		assertNull(resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
@@ -105,7 +105,7 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -114,7 +114,7 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
@@ -123,7 +123,7 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(null);
 		
 		assertNull(resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
@@ -134,7 +134,7 @@ public class EclipseLinkOrmVersionMappingTests
 		
 		javaVersionMapping.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		assertNull(resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		assertFalse(javaVersionMapping.getMutable().isMutable());
@@ -145,7 +145,7 @@ public class EclipseLinkOrmVersionMappingTests
 		EclipseLinkVersionMapping virtualContextVersion = (EclipseLinkVersionMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceVersion.getMutable());
-		assertTrue(virtualContextVersion.getMutable().isDefaultMutable());
+		assertTrue(virtualContextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, virtualContextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(virtualContextVersion.getMutable().isMutable());
 		assertFalse(javaVersionMapping.getMutable().isMutable());
@@ -155,7 +155,7 @@ public class EclipseLinkOrmVersionMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("id");
 		EclipseLinkBasicMapping contextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceVersion.getMutable());
-		assertTrue(contextBasic.getMutable().isDefaultMutable());
+		assertTrue(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertTrue(contextBasic.getMutable().isMutable());
 		assertFalse(javaVersionMapping.getMutable().isMutable());
@@ -178,7 +178,7 @@ public class EclipseLinkOrmVersionMappingTests
 		// check defaults
 		
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -187,7 +187,7 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -196,7 +196,7 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
@@ -205,26 +205,26 @@ public class EclipseLinkOrmVersionMappingTests
 		resourceVersion.setMutable(null);
 		
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.TRUE);
 		assertNull(resourceVersion.getMutable());
-		assertTrue(contextVersion.getMutable().isDefaultMutable());
+		assertTrue(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(Boolean.FALSE);
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
 		getPersistenceUnit().getEclipseLinkOptions().setTemporalMutable(null);
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -232,7 +232,7 @@ public class EclipseLinkOrmVersionMappingTests
 		
 		javaVersionMapping.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		assertTrue(javaVersionMapping.getMutable().isMutable());
@@ -243,7 +243,7 @@ public class EclipseLinkOrmVersionMappingTests
 		EclipseLinkVersionMapping virtualContextVersion = (EclipseLinkVersionMapping) ormPersistentAttribute2.getMapping();
 		
 		assertNull(resourceVersion.getMutable());
-		assertFalse(virtualContextVersion.getMutable().isDefaultMutable());
+		assertFalse(virtualContextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, virtualContextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(virtualContextVersion.getMutable().isMutable());
 		assertTrue(javaVersionMapping.getMutable().isMutable());
@@ -253,7 +253,7 @@ public class EclipseLinkOrmVersionMappingTests
 		ormPersistentAttribute2 = ormPersistentType.getAttributeNamed("myDate");
 		EclipseLinkBasicMapping contextBasic = (EclipseLinkBasicMapping) ormPersistentAttribute2.getMapping();
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextBasic.getMutable().isDefaultMutable());
+		assertFalse(contextBasic.getMutable().getDefaultMutable());
 		assertNull(contextBasic.getMutable().getSpecifiedMutable());
 		assertFalse(contextBasic.getMutable().isMutable());
 		assertTrue(javaVersionMapping.getMutable().isMutable());
@@ -275,7 +275,7 @@ public class EclipseLinkOrmVersionMappingTests
 		// check defaults
 		
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -284,7 +284,7 @@ public class EclipseLinkOrmVersionMappingTests
 		contextVersion.getMutable().setSpecifiedMutable(Boolean.TRUE);
 		
 		assertEquals(Boolean.TRUE, resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.TRUE, contextVersion.getMutable().getSpecifiedMutable());
 		assertTrue(contextVersion.getMutable().isMutable());
 		
@@ -293,7 +293,7 @@ public class EclipseLinkOrmVersionMappingTests
 		contextVersion.getMutable().setSpecifiedMutable(Boolean.FALSE);
 		
 		assertEquals(Boolean.FALSE, resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertEquals(Boolean.FALSE, contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 		
@@ -302,7 +302,7 @@ public class EclipseLinkOrmVersionMappingTests
 		contextVersion.getMutable().setSpecifiedMutable(null);
 		
 		assertNull(resourceVersion.getMutable());
-		assertFalse(contextVersion.getMutable().isDefaultMutable());
+		assertFalse(contextVersion.getMutable().getDefaultMutable());
 		assertNull(contextVersion.getMutable().getSpecifiedMutable());
 		assertFalse(contextVersion.getMutable().isMutable());
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java
index bd6f35e65a..98fe6e321d 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java
@@ -112,11 +112,11 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase
 
 	/** ****** CacheTypeDefault ******* */
 	private ModifiablePropertyValueModel<EclipseLinkCacheType> buildCacheTypeDefaultAA(PropertyValueModel<EclipseLinkCaching> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY,
-				EclipseLinkCaching.CACHE_TYPE_DEFAULT_TRANSFORMER,
-				EclipseLinkCaching.SET_CACHE_TYPE_DEFAULT_CLOSURE
+				c -> c.getCacheTypeDefault(),
+				(EclipseLinkCaching c, EclipseLinkCacheType type) -> c.setCacheTypeDefault(type)
 			);
 	}
 
@@ -130,11 +130,11 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase
 
 	/** ****** SharedCacheDefault ******* */
 	private ModifiablePropertyValueModel<Boolean> buildSharedCacheDefaultAA(PropertyValueModel<EclipseLinkCaching> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY,
-				EclipseLinkCaching.SHARED_CACHE_DEFAULT_TRANSFORMER,
-				EclipseLinkCaching.SET_SHARED_CACHE_DEFAULT_CLOSURE
+				c -> c.getSharedCacheDefault(),
+				(EclipseLinkCaching c, Boolean value) -> c.setSharedCacheDefault(value)
 			);
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java
index c41a5e3133..5970190221 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java
@@ -82,11 +82,11 @@ public class CustomizationValueModelTests extends EclipseLinkPersistenceUnitTest
 
 	// ****** ThrowExceptions *******
 	private ModifiablePropertyValueModel<Boolean> buildThrowExceptionsAA(PropertyValueModel<EclipseLinkCustomization> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY,
-				EclipseLinkCustomization.THROW_EXCEPTIONS_TRANSFORMER,
-				EclipseLinkCustomization.SET_THROW_EXCEPTIONS_CLOSURE
+				c -> c.getThrowExceptions(),
+				(c, value) -> c.setThrowExceptions(value)
 			);
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
index 5ff1bea72f..459db7be04 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/EclipseLinkPersistenceUnitTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -136,7 +136,7 @@ public class EclipseLinkPersistenceUnitTests
 		assertNotNull(persistenceUnit.getImpliedEclipseLinkMappingFileRef());
 		
 		// ignore in persistence unit
-		persistenceUnit.getGeneralProperties().setExcludeEclipselinkOrm(Boolean.TRUE);
+		persistenceUnit.getGeneralProperties().setExcludeEclipseLinkOrm(Boolean.TRUE);
 		
 		assertTrue(eclipseLinkOrmResource.fileExists());
 		assertNotNull(persistenceUnit.getImpliedMappingFileRef());
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesAdapterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesAdapterTests.java
index 169f96e0eb..fbc5c4c954 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2008, 2011 Oracle. All rights reserved.
+* Copyright (c) 2008, 2016 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -83,7 +83,7 @@ public class GeneralPropertiesAdapterTests extends EclipseLinkPersistenceUnitTes
 	protected Object getProperty(String propertyName) throws NoSuchFieldException {
 		Object modelValue = null;
 		if (propertyName.equals(EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY))
-			modelValue = this.generalProperties.getExcludeEclipselinkOrm();
+			modelValue = this.generalProperties.getExcludeEclipseLinkOrm();
 		else
 			this.throwMissingDefinition("getProperty", propertyName);
 		return modelValue;
@@ -92,7 +92,7 @@ public class GeneralPropertiesAdapterTests extends EclipseLinkPersistenceUnitTes
 	@Override
 	protected void setProperty(String propertyName, Object newValue) throws Exception {
 		if (propertyName.equals(EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY))
-			this.generalProperties.setExcludeEclipselinkOrm((Boolean) newValue);
+			this.generalProperties.setExcludeEclipseLinkOrm((Boolean) newValue);
 		else
 			this.throwMissingDefinition("setProperty", propertyName);
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java
index df5ac7f9ef..7e9f6150cd 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java
@@ -79,11 +79,11 @@ public class GeneralPropertiesValueModelTests extends EclipseLinkPersistenceUnit
 
 	// ****** ExcludeEclipselinkOrm *******
 	private ModifiablePropertyValueModel<Boolean> buildExcludeEclipselinkOrmAA(PropertyValueModel<EclipseLinkGeneralProperties> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY,
-				EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_TRANSFORMER,
-				EclipseLinkGeneralProperties.SET_EXCLUDE_ECLIPSELINK_ORM_CLOSURE
+				gp -> gp.getExcludeEclipseLinkOrm(),
+				(gp, value) -> gp.setExcludeEclipseLinkOrm(value)
 			);
 	}
 
@@ -99,7 +99,7 @@ public class GeneralPropertiesValueModelTests extends EclipseLinkPersistenceUnit
 	public void testValue() {
 		// ****** ExcludeEclipselinkOrm ******* 
 		this.verifyExcludeEclipselinkOrmAAValue(EXCLUDE_ECLIPSELINK_ORM_TEST_VALUE);
-		assertEquals(EclipseLinkGeneralProperties.DEFAULT_EXCLUDE_ECLIPSELINK_ORM, this.generalProperty.getDefaultExcludeEclipselinkOrm());
+		assertEquals(EclipseLinkGeneralProperties.DEFAULT_EXCLUDE_ECLIPSELINK_ORM, this.generalProperty.getDefaultExcludeEclipseLinkOrm());
 	}
 
 	public void testSetValue() throws Exception {
@@ -137,7 +137,7 @@ public class GeneralPropertiesValueModelTests extends EclipseLinkPersistenceUnit
 	protected void verifyExcludeEclipselinkOrmAAValue(Boolean testValue) {
 		this.verifyAAValue(
 			testValue, 
-			this.generalProperty.getExcludeEclipselinkOrm(), 
+			this.generalProperty.getExcludeEclipseLinkOrm(), 
 			this.excludeEclipselinkOrmHolder, 
 			EclipseLinkGeneralProperties.ECLIPSELINK_EXCLUDE_ECLIPSELINK_ORM);
 	}
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java
index bfbba20fbf..f588dcb4c5 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java
@@ -79,11 +79,11 @@ public class LoggingValueModelTests extends EclipseLinkPersistenceUnitTestCase
 
 	// ****** Timestamp *******
 	private ModifiablePropertyValueModel<Boolean> buildTimestampAA(PropertyValueModel<EclipseLinkLogging> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkLogging.TIMESTAMP_PROPERTY,
-				EclipseLinkLogging.TIMESTAMP_TRANSFORMER,
-				EclipseLinkLogging.SET_TIMESTAMP_CLOSURE
+				m -> m.getTimestamp(),
+				(m, value) -> m.setTimestamp(value)
 			);
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java
index 403685074a..35fae01e44 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java
@@ -78,11 +78,11 @@ public class OptionsValueModelTests extends EclipseLinkPersistenceUnitTestCase
 
 	// ****** IncludeDescriptorQueries *******
 	private ModifiablePropertyValueModel<Boolean> buildIncludeDescriptorQueriesAA(PropertyValueModel<EclipseLinkOptions> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkOptions.INCLUDE_DESCRIPTOR_QUERIES_PROPERTY,
-				EclipseLinkOptions.INCLUDE_DESCRIPTOR_QUERIES_TRANSFORMER,
-				EclipseLinkOptions.SET_INCLUDE_DESCRIPTOR_QUERIES_CLOSURE
+				o -> o.getIncludeDescriptorQueries(),
+				(o, value) -> o.setIncludeDescriptorQueries(value)
 			);
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java
index 5aec5d2f97..4790b1bdc4 100644
--- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java
@@ -84,11 +84,11 @@ public class SchemaGenerationValueModelTests extends EclipseLinkPersistenceUnitT
 
 	/** ****** DdlGenerationType ******* */
 	private ModifiablePropertyValueModel<EclipseLinkDdlGenerationType> buildDdlGenerationTypeAA(PropertyValueModel<EclipseLinkSchemaGeneration> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkSchemaGeneration.DDL_GENERATION_TYPE_PROPERTY,
-				EclipseLinkSchemaGeneration.DDL_GENERATION_TYPE_TRANSFORMER,
-				EclipseLinkSchemaGeneration.SET_DDL_GENERATION_TYPE_CLOSURE
+				sg -> sg.getDdlGenerationType(),
+				(sg, value) -> sg.setDdlGenerationType(value)
 			);
 	}
 
@@ -102,11 +102,11 @@ public class SchemaGenerationValueModelTests extends EclipseLinkPersistenceUnitT
 
 	/** ****** OutputMode ******* */
 	private ModifiablePropertyValueModel<EclipseLinkOutputMode> buildOutputModeAA(PropertyValueModel<EclipseLinkSchemaGeneration> subjectModel) {
-		return PropertyValueModelTools.modifiableModelAspectAdapter(
+		return PropertyValueModelTools.modifiableSubjectModelAspectAdapter(
 				subjectModel,
 				EclipseLinkSchemaGeneration.OUTPUT_MODE_PROPERTY,
-				EclipseLinkSchemaGeneration.OUTPUT_MODE_TRANSFORMER,
-				EclipseLinkSchemaGeneration.SET_OUTPUT_MODE_CLOSURE
+				sg -> sg.getOutputMode(),
+				(sg, value) -> sg.setOutputMode(value)
 			);
 	}
 
@@ -122,12 +122,12 @@ public class SchemaGenerationValueModelTests extends EclipseLinkPersistenceUnitT
 		/** ****** DdlGenerationType ******* */
 		this.verifyDdlGenerationTypeAAValue(DDL_GENERATION_TYPE_TEST_VALUE);
 		assertEquals(
-			EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_DDL_GENERATION_TYPE,
+			EclipseLinkSchemaGeneration.DEFAULT_DDL_GENERATION_TYPE,
 			this.schemaGen.getDefaultDdlGenerationType());
 		/** ****** OutputMode ******* */
 		this.verifyOutputModeAAValue(OUTPUT_MODE_TEST_VALUE);
 		assertEquals(
-			EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_OUTPUT_MODE,
+			EclipseLinkSchemaGeneration.DEFAULT_OUTPUT_MODE,
 			this.schemaGen.getDefaultOutputMode());
 	}