Renamed properties files and classes that load them

30 files changed, 176 insertions, 176 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java
index 64ed1c5287..a01080f65b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jpt.core.internal.mappings.IAbstractJoinColumn;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -58,7 +58,7 @@ public abstract class AbstractJoinColumnDialog<E extends IAbstractJoinColumn> ex
 	}
 	
 	protected String getTitle() {
-		return JpaUiMappingsMessages.JoinColumnDialog_editJoinColumn;
+		return JptUiMappingsMessages.JoinColumnDialog_editJoinColumn;
 	}
 	
 	protected Control createDialogArea(Composite parent) {
@@ -67,7 +67,7 @@ public abstract class AbstractJoinColumnDialog<E extends IAbstractJoinColumn> ex
 		gridLayout.numColumns = 2;
 		
 		Label nameLabel = new Label(composite, SWT.LEFT);
-		nameLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_name);
+		nameLabel.setText(JptUiMappingsMessages.JoinColumnDialog_name);
 		GridData gridData = new GridData();
 		nameLabel.setLayoutData(gridData);
 		
@@ -80,7 +80,7 @@ public abstract class AbstractJoinColumnDialog<E extends IAbstractJoinColumn> ex
 		populateNameCombo();
 	
 		Label referencedColumnNameLabel = new Label(composite, SWT.LEFT);
-		referencedColumnNameLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_referencedColumnName);
+		referencedColumnNameLabel.setText(JptUiMappingsMessages.JoinColumnDialog_referencedColumnName);
 		gridData = new GridData();
 		referencedColumnNameLabel.setLayoutData(gridData);
 
@@ -97,7 +97,7 @@ public abstract class AbstractJoinColumnDialog<E extends IAbstractJoinColumn> ex
 	
 	protected void populateNameCombo() {
 		if (getJoinColumn() != null) {
-			this.nameCombo.add(NLS.bind(JpaUiMappingsMessages.JoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultName()));
+			this.nameCombo.add(NLS.bind(JptUiMappingsMessages.JoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultName()));
 		}
 		Table table = getNameTable();
 		if (table != null) {
@@ -129,7 +129,7 @@ public abstract class AbstractJoinColumnDialog<E extends IAbstractJoinColumn> ex
 
 	protected void populateReferencedNameCombo() {
 		if (getJoinColumn() != null) {
-			this.referencedColumnNameCombo.add(NLS.bind(JpaUiMappingsMessages.JoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultReferencedColumnName()));
+			this.referencedColumnNameCombo.add(NLS.bind(JptUiMappingsMessages.JoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultReferencedColumnName()));
 		}
 		Table referencedNameTable = getReferencedNameTable();
 		if (referencedNameTable != null) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CatalogCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CatalogCombo.java
index 02aab134bc..91430694c8 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CatalogCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CatalogCombo.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.db.internal.Database;
 import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.osgi.util.NLS;
@@ -130,7 +130,7 @@ public class CatalogCombo extends BaseJpaController
 	@Override
 	protected void buildWidget( Composite parent) {
 		this.combo = getWidgetFactory().createCCombo( parent, SWT.FLAT);
-		this.combo.add( JpaUiMappingsMessages.TableComposite_defaultEmpty);
+		this.combo.add( JptUiMappingsMessages.TableComposite_defaultEmpty);
 		
 		this.combo.addModifyListener( new ModifyListener() {
 			
@@ -236,7 +236,7 @@ public class CatalogCombo extends BaseJpaController
 //		String defaultCatalogName = this.table.getDefaultCatalog();		// DefaultCatalog cannot be initialized if DB not online
 		String defaultCatalogName = this.getDatabase().getDefaultCatalogName();		// TOREVIEW
 		int selectionIndex = combo.getSelectionIndex();
-		combo.setItem( 0, NLS.bind( JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultCatalogName));
+		combo.setItem( 0, NLS.bind( JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultCatalogName));
 		if ( selectionIndex == 0) {
 			combo.clearSelection();
 			combo.select( 0);
@@ -256,7 +256,7 @@ public class CatalogCombo extends BaseJpaController
 			}
 		}
 		else {
-			if ( ! this.combo.getText().equals( NLS.bind( JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultCatalogName))) {
+			if ( ! this.combo.getText().equals( NLS.bind( JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultCatalogName))) {
 				this.combo.select( 0);
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java
index 75d735685c..91a6f5f3cb 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.EnumComboViewer.EnumHolder;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.osgi.util.NLS;
@@ -150,7 +150,7 @@ public class ColumnComposite extends BaseJpaComposite
 		layout.marginWidth = 0;		
 		composite.setLayout(layout);	
 		
-		Group columnGroup = getWidgetFactory().createGroup(composite, JpaUiMappingsMessages.ColumnComposite_columnSection);
+		Group columnGroup = getWidgetFactory().createGroup(composite, JptUiMappingsMessages.ColumnComposite_columnSection);
 		layout = new GridLayout();
 		layout.marginHeight = 0;				
 		columnGroup.setLayout(layout);
@@ -196,13 +196,13 @@ public class ColumnComposite extends BaseJpaComposite
 		this.tableCombo.setLayoutData(gridData);
 		helpSystem.setHelp(tableCombo, IJpaHelpContextIds.MAPPING_COLUMN_TABLE);
 
-		getWidgetFactory().createLabel(intermediaryComposite, JpaUiMappingsMessages.ColumnComposite_insertable);
+		getWidgetFactory().createLabel(intermediaryComposite, JptUiMappingsMessages.ColumnComposite_insertable);
 
 		this.insertableComboViewer = new EnumComboViewer(intermediaryComposite, this.commandStack, getWidgetFactory());
 		this.insertableComboViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
 		helpSystem.setHelp(this.insertableComboViewer.getControl(), IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE);
 
-		getWidgetFactory().createLabel(intermediaryComposite, JpaUiMappingsMessages.ColumnComposite_updatable);
+		getWidgetFactory().createLabel(intermediaryComposite, JptUiMappingsMessages.ColumnComposite_updatable);
 
 		this.updatableComboViewer = new EnumComboViewer(intermediaryComposite, this.commandStack, getWidgetFactory());
 		this.updatableComboViewer.getControl().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
@@ -212,7 +212,7 @@ public class ColumnComposite extends BaseJpaComposite
 	
 	private CCombo buildColumnCombo(Composite parent) {
 		final CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-  		combo.add(JpaUiMappingsMessages.ColumnComposite_defaultEmpty);
+  		combo.add(JptUiMappingsMessages.ColumnComposite_defaultEmpty);
 		combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				if (isPopulating()) {
@@ -243,7 +243,7 @@ public class ColumnComposite extends BaseJpaComposite
 	
 	private CCombo buildTableCombo(Composite parent) {
 		final CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-  		combo.add(JpaUiMappingsMessages.ColumnComposite_defaultEmpty);
+  		combo.add(JptUiMappingsMessages.ColumnComposite_defaultEmpty);
 		combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				if (isPopulating()) {
@@ -377,7 +377,7 @@ public class ColumnComposite extends BaseJpaComposite
 	protected void populateDefaultColumnName() {
 		String defaultTableName = column.getDefaultName();
 		int selectionIndex = columnCombo.getSelectionIndex();
-		columnCombo.setItem(0, NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
+		columnCombo.setItem(0, NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
 		if (selectionIndex == 0) {
 			//combo text does not update when switching between 2 mappings of the same type
 			//that both have a default column name.  clear the selection and then set it again
@@ -395,7 +395,7 @@ public class ColumnComposite extends BaseJpaComposite
 		}
 		else {
 			String defaultColumnName = this.column.getDefaultName();
-			if (!this.columnCombo.getText().equals(NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultColumnName))) {
+			if (!this.columnCombo.getText().equals(NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultColumnName))) {
 				this.columnCombo.select(0);
 			}
 		}
@@ -418,7 +418,7 @@ public class ColumnComposite extends BaseJpaComposite
 	protected void populateDefaultColumnTable() {
 		String defaultTableName = column.getDefaultTable();
 		int selectionIndex = tableCombo.getSelectionIndex();
-		tableCombo.setItem(0, NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
+		tableCombo.setItem(0, NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
 		if (selectionIndex == 0) {
 			//combo text does not update when switching between 2 mappings of the same type
 			//that both have a default column name.  clear the selection and then set it again
@@ -436,7 +436,7 @@ public class ColumnComposite extends BaseJpaComposite
 			}
 		}
 		else {
-			if (!this.tableCombo.getText().equals(NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName))) {
+			if (!this.tableCombo.getText().equals(NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName))) {
 				this.tableCombo.select(0);
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CommonWidgets.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CommonWidgets.java
index eb36961fe4..3a2975dd26 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CommonWidgets.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CommonWidgets.java
@@ -20,7 +20,7 @@ import org.eclipse.jpt.core.internal.mappings.IColumn;
 import org.eclipse.jpt.core.internal.mappings.IMultiRelationshipMapping;
 import org.eclipse.jpt.core.internal.mappings.ISingleRelationshipMapping;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.EnumComboViewer.EnumHolder;
 import org.eclipse.jpt.ui.internal.mappings.details.StringWithDefaultChooser.StringHolder;
 import org.eclipse.osgi.util.NLS;
@@ -31,7 +31,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
 public class CommonWidgets 
 {
 	public static Label buildEntityNameLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.EntityGeneralSection_name);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.EntityGeneralSection_name);
 	}
 
 	public static EntityNameCombo buildEntityNameCombo(
@@ -40,15 +40,15 @@ public class CommonWidgets
 	}
 	
 	public static Label buildTableLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.TableChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.TableChooser_label);
 	}
 	
 	public static Label buildCatalogLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.CatalogChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.CatalogChooser_label);
 	}
 	
 	public static Label buildSchemaLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.SchemaChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.SchemaChooser_label);
 	}
 	
 	public static StringWithDefaultChooser buildStringWithDefaultChooser(
@@ -58,27 +58,27 @@ public class CommonWidgets
 
 
 	public static Label buildFetchLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.BasicGeneralSection_fetchLabel);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.BasicGeneralSection_fetchLabel);
 	}
 	
 	public static Label buildTargetEntityLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.TargetEntityChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.TargetEntityChooser_label);
 	}
 	
 	public static Label buildOptionalLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.BasicGeneralSection_optionalLabel);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.BasicGeneralSection_optionalLabel);
 	}
 	
 	public static Label buildTemporalLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.BasicGeneralSection_temporalLabel);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.BasicGeneralSection_temporalLabel);
 	}
 	
 	public static Label buildEnumeratedLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.BasicGeneralSection_enumeratedLabel);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.BasicGeneralSection_enumeratedLabel);
 	}
 	
 	public static Label buildMappedByLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.NonOwningMapping_mappedByLabel);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.NonOwningMapping_mappedByLabel);
 	}
 	
 	public static EnumComboViewer buildFetchTypeComboViewer(
@@ -100,11 +100,11 @@ public class CommonWidgets
 	}
 		
 	public static Label buildColumnLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.ColumnChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.ColumnChooser_label);
 	}
 	
 	public static Label buildColumnTableLabel(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) {
-		return widgetFactory.createLabel(parent, JpaUiMappingsMessages.ColumnTableChooser_label);
+		return widgetFactory.createLabel(parent, JptUiMappingsMessages.ColumnTableChooser_label);
 	}
 	
 	public static ColumnTableHolder buildColumnTableHolder(IColumn column) {
@@ -225,9 +225,9 @@ public class CommonWidgets
 		public String defaultItem() {
 			String defaultName = getColumn().getDefaultTable();
 			if (defaultName != null) {
-				return NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultName);
+				return NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultName);
 			}
-			return JpaUiMappingsMessages.ColumnComposite_defaultEmpty;
+			return JptUiMappingsMessages.ColumnComposite_defaultEmpty;
 		}
 		
 		public String getString() {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java
index e150c6766b..84b394508e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.core.internal.mappings.IEmbedded;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -86,7 +86,7 @@ public class EmbeddedAttributeOverridesComposite extends BaseJpaComposite
 		composite.setLayout(layout);
 		
 		Group attributeOverridesGroup = getWidgetFactory().createGroup(
-			composite, JpaUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
+			composite, JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
 		attributeOverridesGroup.setLayout(new GridLayout(2, true));
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = SWT.FILL;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java
index 42edef323d..d95b2b88a5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.internal.mappings.ITable;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.StringWithDefaultChooser.StringHolder;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -109,7 +109,7 @@ public class EntityComposite extends BaseJpaComposite
 	
 	private Control buildSecondaryTablesComposite(Composite composite) {
 	    Section section = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    section.setText(JpaUiMappingsMessages.SecondaryTablesComposite_secondaryTables);
+	    section.setText(JptUiMappingsMessages.SecondaryTablesComposite_secondaryTables);
 
 		Composite client = getWidgetFactory().createComposite(section);
 		section.setClient(client);
@@ -131,7 +131,7 @@ public class EntityComposite extends BaseJpaComposite
 
 	private Control buildInheritanceComposite(Composite composite) {
 	    Section section = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    section.setText(JpaUiMappingsMessages.EntityComposite_inheritance);
+	    section.setText(JptUiMappingsMessages.EntityComposite_inheritance);
 
 		Composite inheritanceClient = getWidgetFactory().createComposite(section);
 		section.setClient(inheritanceClient);
@@ -153,7 +153,7 @@ public class EntityComposite extends BaseJpaComposite
 
 	private Control buildAttributeOverridesComposite(Composite composite) {
 	    Section section = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    section.setText(JpaUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
+	    section.setText(JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
 	    section.setExpanded(true);
 		Composite client = getWidgetFactory().createComposite(section);
 		section.setClient(client);
@@ -260,9 +260,9 @@ public class EntityComposite extends BaseJpaComposite
 		public String defaultItem() {
 			String defaultName = getTable().getDefaultName();
 			if (defaultName != null) {
-				return NLS.bind(JpaUiMappingsMessages.EntityComposite_tableDefault, defaultName);
+				return NLS.bind(JptUiMappingsMessages.EntityComposite_tableDefault, defaultName);
 			}
-			return JpaUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
+			return JptUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
 		}
 		
 		public String getString() {
@@ -291,9 +291,9 @@ public class EntityComposite extends BaseJpaComposite
 		public String defaultItem() {
 			String defaultCatalog = getTable().getDefaultCatalog();
 			if (defaultCatalog != null) {
-				return NLS.bind(JpaUiMappingsMessages.EntityComposite_tableDefault, defaultCatalog);
+				return NLS.bind(JptUiMappingsMessages.EntityComposite_tableDefault, defaultCatalog);
 			}
-			return JpaUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
+			return JptUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
 		}
 		
 		public String getString() {
@@ -322,9 +322,9 @@ public class EntityComposite extends BaseJpaComposite
 		public String defaultItem() {
 			String defaultSchema = getTable().getDefaultSchema();
 			if (defaultSchema != null) {
-				return NLS.bind(JpaUiMappingsMessages.EntityComposite_tableDefault, defaultSchema);
+				return NLS.bind(JptUiMappingsMessages.EntityComposite_tableDefault, defaultSchema);
 			}
-			return JpaUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
+			return JptUiMappingsMessages.EntityComposite_tableNoDefaultSpecified;
 		}
 		
 		public String getString() {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java
index 034de364de..8fe0ffcf4c 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.core.internal.mappings.IEntity;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -133,7 +133,7 @@ public class EntityNameCombo extends BaseJpaController
 			return;
 		}
 		
-		String defaultItem = NLS.bind(JpaUiMappingsMessages.EntityGeneralSection_nameDefaultWithOneParam, entity.getDefaultName());
+		String defaultItem = NLS.bind(JptUiMappingsMessages.EntityGeneralSection_nameDefaultWithOneParam, entity.getDefaultName());
 		String specifiedName = entity.getSpecifiedName();
 		
 		if (specifiedName == null) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
index 33505b970c..8f8e0fb92d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java
@@ -26,7 +26,7 @@ import org.eclipse.jpt.core.internal.platform.IGeneratorRepository;
 import org.eclipse.jpt.core.internal.platform.NullGeneratorRepository;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.CComboViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -72,7 +72,7 @@ public class GeneratedValueComposite extends BaseJpaComposite
 		
 		IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.GeneratedValueComposite_strategy);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.GeneratedValueComposite_strategy);
 		
 		this.strategyComboViewer = buildStrategyComboViewer(composite);
 		GridData gridData = new GridData();
@@ -81,7 +81,7 @@ public class GeneratedValueComposite extends BaseJpaComposite
 		this.strategyComboViewer.getCombo().setLayoutData(gridData);
 		helpSystem.setHelp(this.strategyComboViewer.getCombo(), IJpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.GeneratedValueComposite_generatorName);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.GeneratedValueComposite_generatorName);
 		
 		this.generatorNameCombo = buildGeneratorNameCombo(composite);
 		gridData = new GridData();
@@ -121,7 +121,7 @@ public class GeneratedValueComposite extends BaseJpaComposite
 
 	protected CCombo buildGeneratorNameCombo(Composite parent) {
 		CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TableComposite_defaultEmpty);
+		combo.add(JptUiMappingsMessages.TableComposite_defaultEmpty);
 		combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				if (isPopulating()) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdComposite.java
index db48058ac9..74eed9a385 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdComposite.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.core.internal.mappings.TemporalType;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.EnumComboViewer.EnumHolder;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -158,7 +158,7 @@ public class IdComposite extends BaseJpaComposite
 		IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
 		
 		this.pkGenerationSection = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    this.pkGenerationSection.setText(JpaUiMappingsMessages.IdMappingComposite_primaryKeyGeneration);
+	    this.pkGenerationSection.setText(JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration);
 
 		Composite generationClient = getWidgetFactory().createComposite(this.pkGenerationSection);
 		this.pkGenerationSection.setClient(generationClient);
@@ -185,7 +185,7 @@ public class IdComposite extends BaseJpaComposite
 		gridData.grabExcessHorizontalSpace = true;
 		this.tableGenSection.setLayoutData(gridData);
 		
-	    this.tableGenSection.setText(JpaUiMappingsMessages.IdMappingComposite_tableGenerator);
+	    this.tableGenSection.setText(JptUiMappingsMessages.IdMappingComposite_tableGenerator);
 
 		Composite tableGenClient = getWidgetFactory().createComposite(this.tableGenSection);
 		this.tableGenSection.setClient(tableGenClient);
@@ -209,7 +209,7 @@ public class IdComposite extends BaseJpaComposite
 
 		
 	    this.sequenceGenSection = getWidgetFactory().createSection(generationClient, SWT.FLAT | ExpandableComposite.TWISTIE);
-	    this.sequenceGenSection.setText(JpaUiMappingsMessages.IdMappingComposite_sequenceGenerator);
+	    this.sequenceGenSection.setText(JptUiMappingsMessages.IdMappingComposite_sequenceGenerator);
 		gridData = new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.grabExcessHorizontalSpace = true;
@@ -238,7 +238,7 @@ public class IdComposite extends BaseJpaComposite
 	}
 	
 	private Button buildPrimaryKeyGenerationCheckBox(Composite parent) {
-		Button button = getWidgetFactory().createButton(parent,JpaUiMappingsMessages.IdMappingComposite_primaryKeyGeneration, SWT.CHECK);
+		Button button = getWidgetFactory().createButton(parent,JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration, SWT.CHECK);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			// ignore
@@ -265,7 +265,7 @@ public class IdComposite extends BaseJpaComposite
 	}
 
 	private Button buildTableGeneratorCheckBox(Composite parent) {
-		Button button = getWidgetFactory().createButton(parent,JpaUiMappingsMessages.IdMappingComposite_tableGenerator, SWT.CHECK);
+		Button button = getWidgetFactory().createButton(parent,JptUiMappingsMessages.IdMappingComposite_tableGenerator, SWT.CHECK);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			// ignore
@@ -298,7 +298,7 @@ public class IdComposite extends BaseJpaComposite
 	}
 
 	private Button buildSequenceGeneratorCheckBox(Composite parent) {
-		Button button = getWidgetFactory().createButton(parent,JpaUiMappingsMessages.IdMappingComposite_sequenceGenerator, SWT.CHECK);
+		Button button = getWidgetFactory().createButton(parent,JptUiMappingsMessages.IdMappingComposite_sequenceGenerator, SWT.CHECK);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			// ignore
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java
index b0eab2d822..0b57a6a621 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java
@@ -34,7 +34,7 @@ import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.widgets.CComboViewer;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.osgi.util.NLS;
@@ -166,7 +166,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 
 		GridData gridData;
 
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.InheritanceComposite_strategy);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.InheritanceComposite_strategy);
 
 		this.strategyViewer = buildStrategyCombo(composite);
 		gridData = new GridData();
@@ -175,7 +175,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 		this.strategyViewer.getCombo().setLayoutData(gridData);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.strategyViewer.getCombo(), IJpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY);
 
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.DiscriminatorColumnComposite_column);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.DiscriminatorColumnComposite_column);
 
 		this.columnCombo = buildColumnCombo(composite);
 		gridData.horizontalAlignment = GridData.FILL;
@@ -183,7 +183,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 		this.columnCombo.setLayoutData(gridData);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.columnCombo, IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType);
 
 		this.discriminatorTypeViewer = buildDiscriminatorTypeCombo(composite);
 		gridData = new GridData();
@@ -193,7 +193,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.discriminatorTypeViewer.getCombo(), IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE);
 	
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.InheritanceComposite_discriminatorValue);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.InheritanceComposite_discriminatorValue);
 
 		this.discriminatorValueCombo = buildDiscriminatorValueCombo(composite);
 		gridData = new GridData();
@@ -237,7 +237,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 	
 	private CCombo buildColumnCombo(Composite parent) {
 		final CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-  		combo.add(JpaUiMappingsMessages.ColumnComposite_defaultEmpty);
+  		combo.add(JptUiMappingsMessages.ColumnComposite_defaultEmpty);
 		combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				if (isPopulating()) {
@@ -402,7 +402,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 	protected void populateDefaultColumnName() {
 		String defaultTableName = discriminatorColumn.getDefaultName();
 		int selectionIndex = columnCombo.getSelectionIndex();
-		columnCombo.setItem(0, NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
+		columnCombo.setItem(0, NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultTableName));
 		if (selectionIndex == 0) {
 			//combo text does not update when switching between 2 mappings of the same type
 			//that both have a default column name.  clear the selection and then set it again
@@ -420,7 +420,7 @@ public class InheritanceComposite extends BaseJpaComposite {
 			}
 		}
 		else {
-			if (!this.columnCombo.getText().equals(NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultName))) {
+			if (!this.columnCombo.getText().equals(NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultName))) {
 				this.columnCombo.select(0);
 			}
 		}
@@ -479,13 +479,13 @@ public class InheritanceComposite extends BaseJpaComposite {
 		if (this.entity.discriminatorValueIsAllowed()) {
 			this.discriminatorValueCombo.setEnabled(true);
 			if (this.discriminatorValueCombo.getItemCount() == 0) {
-				this.discriminatorValueCombo.add(JpaUiMappingsMessages.DiscriminatorColumnComposite_defaultEmpty);
+				this.discriminatorValueCombo.add(JptUiMappingsMessages.DiscriminatorColumnComposite_defaultEmpty);
 			}
 			if (defaultValue != null) {
-				this.discriminatorValueCombo.setItem(0, NLS.bind(JpaUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultValue));
+				this.discriminatorValueCombo.setItem(0, NLS.bind(JptUiMappingsMessages.ColumnComposite_defaultWithOneParam, defaultValue));
 			}
 			else {
-				this.discriminatorValueCombo.setItem(0, JpaUiMappingsMessages.DiscriminatorColumnComposite_defaultEmpty);
+				this.discriminatorValueCombo.setItem(0, JptUiMappingsMessages.DiscriminatorColumnComposite_defaultEmpty);
 			}
 		}
 		else {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialog.java
index 904ba1b784..108303a52b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialog.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.internal.mappings.IJoinColumn;
 import org.eclipse.jpt.core.internal.mappings.IJoinTable;
 import org.eclipse.jpt.core.internal.mappings.IMultiRelationshipMapping;
 import org.eclipse.jpt.db.internal.Table;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Shell;
 
@@ -30,7 +30,7 @@ public class InverseJoinColumnDialog extends JoinColumnInJoinTableDialog {
 	}
 	
 	protected String getTitle() {
-		return JpaUiMappingsMessages.InverseJoinColumnDialog_editInverseJoinColumn;
+		return JptUiMappingsMessages.InverseJoinColumnDialog_editInverseJoinColumn;
 	}
 	
 	protected void populateNameCombo() {
@@ -38,7 +38,7 @@ public class InverseJoinColumnDialog extends JoinColumnInJoinTableDialog {
 			return;
 		}
 		if (getJoinColumn() != null) {
-			getNameCombo().add(NLS.bind(JpaUiMappingsMessages.InverseJoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultName()));
+			getNameCombo().add(NLS.bind(JptUiMappingsMessages.InverseJoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultName()));
 		}
 		Table joinDBTable = getJoinTable().dbTable();
 		if (joinDBTable != null) {
@@ -59,7 +59,7 @@ public class InverseJoinColumnDialog extends JoinColumnInJoinTableDialog {
 			return;
 		}
 		if (getJoinColumn() != null) {
-			getReferencedColumnNameCombo().add(NLS.bind(JpaUiMappingsMessages.InverseJoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultReferencedColumnName()));
+			getReferencedColumnNameCombo().add(NLS.bind(JptUiMappingsMessages.InverseJoinColumnDialog_defaultWithOneParam, getJoinColumn().getDefaultReferencedColumnName()));
 		}
 		IMultiRelationshipMapping multiRelationshipMapping = (IMultiRelationshipMapping) getJoinTable().eContainer();
 		IEntity targetEntity = multiRelationshipMapping.getResolvedTargetEntity();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java
index 50b0779b5d..7b0b4a9a45 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java
@@ -35,7 +35,7 @@ import org.eclipse.jpt.core.internal.mappings.ISingleRelationshipMapping;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -98,7 +98,7 @@ public class JoinColumnComposite
 		this.overrideDefaultJoinColumnsCheckBox = 
 			getWidgetFactory().createButton(
 				composite, 
-				JpaUiMappingsMessages.JoinColumnComposite_overrideDefaultJoinColumns, 
+				JptUiMappingsMessages.JoinColumnComposite_overrideDefaultJoinColumns, 
 				SWT.CHECK);
 		this.overrideDefaultJoinColumnsCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -124,7 +124,7 @@ public class JoinColumnComposite
 		this.joinColumnsGroup = 
 			getWidgetFactory().createGroup(
 				composite, 
-				JpaUiMappingsMessages.JoinColumnComposite_joinColumn);
+				JptUiMappingsMessages.JoinColumnComposite_joinColumn);
 		this.joinColumnsGroup.setLayout(new GridLayout(2, false));
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
@@ -146,7 +146,7 @@ public class JoinColumnComposite
 		this.joinColumnsListViewer.getList().setLayoutData(gridData);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.joinColumnsListViewer.getList(), IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS);
 		
-		Button addJoinColumnButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinColumnComposite_add, SWT.NONE);
+		Button addJoinColumnButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinColumnComposite_add, SWT.NONE);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		addJoinColumnButton.setLayoutData(gridData);
@@ -159,7 +159,7 @@ public class JoinColumnComposite
 			}
 		});
 		
-		this.joinColumnsEditButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinColumnComposite_edit, SWT.NONE);
+		this.joinColumnsEditButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinColumnComposite_edit, SWT.NONE);
 		this.joinColumnsEditButton.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
@@ -172,7 +172,7 @@ public class JoinColumnComposite
 		gridData.horizontalAlignment = GridData.FILL;
 		this.joinColumnsEditButton.setLayoutData(gridData);
 
-		this.joinColumnsRemoveButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinColumnComposite_remove, SWT.NONE);
+		this.joinColumnsRemoveButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinColumnComposite_remove, SWT.NONE);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.verticalAlignment = GridData.BEGINNING;
@@ -220,21 +220,21 @@ public class JoinColumnComposite
 	}
 	
 	String buildDefaultJoinColumnLabel(IJoinColumn joinColumn) {
-		return NLS.bind(JpaUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+		return NLS.bind(JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 	}
 	
 	String buildJoinColumnLabel(IJoinColumn joinColumn) {
 		if (joinColumn.getSpecifiedName() == null) {
 			if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-				return NLS.bind(JpaUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
+				return NLS.bind(JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
 			}
-			return NLS.bind(JpaUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
+			return NLS.bind(JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
 		}
 		else if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-			return NLS.bind(JpaUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+			return NLS.bind(JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 		}
 		else {
-			return NLS.bind(JpaUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
+			return NLS.bind(JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
 		}
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java
index abba08a809..3be3277b01 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.internal.mappings.IJoinColumn;
 import org.eclipse.jpt.core.internal.mappings.ISingleRelationshipMapping;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -53,7 +53,7 @@ public class JoinColumnDialog extends AbstractJoinColumnDialog<IJoinColumn> {
 		Composite composite = (Composite) super.createDialogArea(parent);
 		
 		Label insertableLabel = new Label(composite, SWT.LEFT);
-		insertableLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_insertable);
+		insertableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_insertable);
 		insertableLabel.setLayoutData(new GridData());
 		
 		this.insertableComboViewer = this.buildInsertableComboViewer(composite);
@@ -61,7 +61,7 @@ public class JoinColumnDialog extends AbstractJoinColumnDialog<IJoinColumn> {
 		helpSystem.setHelp(this.insertableComboViewer.getCombo(), IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE);
 	
 		Label updatableLabel = new Label(composite, SWT.LEFT);
-		updatableLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_updatable);
+		updatableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_updatable);
 		updatableLabel.setLayoutData(new GridData());
 		
 		this.updatableComboViewer = this.buildUpdatableComboViewer(composite);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
index e4fae53f25..f2c40a13fc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.internal.mappings.IJoinColumn;
 import org.eclipse.jpt.core.internal.mappings.ISingleRelationshipMapping;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -55,7 +55,7 @@ public class JoinColumnInAssociationOverrideDialog extends AbstractJoinColumnDia
 		Composite composite = (Composite) super.createDialogArea(parent);
 		
 		Label insertableLabel = new Label(composite, SWT.LEFT);
-		insertableLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_insertable);
+		insertableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_insertable);
 		insertableLabel.setLayoutData(new GridData());
 		
 		this.insertableComboViewer = this.buildInsertableComboViewer(composite);
@@ -63,7 +63,7 @@ public class JoinColumnInAssociationOverrideDialog extends AbstractJoinColumnDia
 		helpSystem.setHelp(this.insertableComboViewer.getCombo(), IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE);
 	
 		Label updatableLabel = new Label(composite, SWT.LEFT);
-		updatableLabel.setText(JpaUiMappingsMessages.JoinColumnDialog_updatable);
+		updatableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_updatable);
 		updatableLabel.setLayoutData(new GridData());
 		
 		this.updatableComboViewer = this.buildUpdatableComboViewer(composite);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java
index 1a5f05e849..8487b23feb 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java
@@ -33,7 +33,7 @@ import org.eclipse.jpt.core.internal.mappings.INamedColumn;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -94,7 +94,7 @@ public class JoinColumnsComposite extends BaseJpaComposite
 		this.joinColumnsGroup = 
 			getWidgetFactory().createGroup(
 				composite, 
-				JpaUiMappingsMessages.JoinTableComposite_joinColumn);
+				JptUiMappingsMessages.JoinTableComposite_joinColumn);
 		this.joinColumnsGroup.setLayout(new GridLayout(2, false));
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
@@ -116,7 +116,7 @@ public class JoinColumnsComposite extends BaseJpaComposite
 		this.joinColumnsListViewer.getList().setLayoutData(gridData);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.joinColumnsListViewer.getList(), IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS);
 		
-		this.joinColumnsAddButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinTableComposite_add, SWT.NONE);
+		this.joinColumnsAddButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinTableComposite_add, SWT.NONE);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		this.joinColumnsAddButton.setLayoutData(gridData);
@@ -129,7 +129,7 @@ public class JoinColumnsComposite extends BaseJpaComposite
 			}
 		});
 		
-		this.joinColumnsEditButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinTableComposite_edit, SWT.NONE);
+		this.joinColumnsEditButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinTableComposite_edit, SWT.NONE);
 		this.joinColumnsEditButton.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
@@ -142,7 +142,7 @@ public class JoinColumnsComposite extends BaseJpaComposite
 		gridData.horizontalAlignment = GridData.FILL;
 		this.joinColumnsEditButton.setLayoutData(gridData);
 
-		this.joinColumnsRemoveButton = getWidgetFactory().createButton(this.joinColumnsGroup, JpaUiMappingsMessages.JoinTableComposite_remove, SWT.NONE);
+		this.joinColumnsRemoveButton = getWidgetFactory().createButton(this.joinColumnsGroup, JptUiMappingsMessages.JoinTableComposite_remove, SWT.NONE);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.verticalAlignment = GridData.BEGINNING;
@@ -191,21 +191,21 @@ public class JoinColumnsComposite extends BaseJpaComposite
 	}
 	
 	private String buildDefaultJoinColumnLabel(IJoinColumn joinColumn) {
-		return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+		return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 	}
 	
 	private String buildJoinColumnLabel(IJoinColumn joinColumn) {
 		if (joinColumn.getSpecifiedName() == null) {
 			if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-				return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
+				return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
 			}
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
 		}
 		else if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 		}
 		else {
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java
index 2c0c44aa72..5bc4b1efab 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java
@@ -29,7 +29,7 @@ import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.Owner;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -162,7 +162,7 @@ public class JoinTableComposite extends BaseJpaComposite
 		layout.marginWidth = 0;
 		composite.setLayout(layout);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.JoinTableComposite_name);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.JoinTableComposite_name);
 		
 		this.tableCombo = new TableCombo(composite, this.commandStack, getWidgetFactory());
 		GridData gridData = new GridData();
@@ -175,7 +175,7 @@ public class JoinTableComposite extends BaseJpaComposite
 		this.overrideDefaultJoinColumnsCheckBox = 
 			getWidgetFactory().createButton(
 				composite, 
-				JpaUiMappingsMessages.JoinTableComposite_overrideDefaultJoinColumns, 
+				JptUiMappingsMessages.JoinTableComposite_overrideDefaultJoinColumns, 
 				SWT.CHECK);
 		this.overrideDefaultJoinColumnsCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -206,7 +206,7 @@ public class JoinTableComposite extends BaseJpaComposite
 		gridData.horizontalSpan = 2;
 		this.joinColumnsComposite.getControl().setLayoutData(gridData);
 		
-		this.overrideDefaultInverseJoinColumnsCheckBox = getWidgetFactory().createButton(composite, JpaUiMappingsMessages.JoinTableComposite_overrideDefaultInverseJoinColumns, SWT.CHECK);
+		this.overrideDefaultInverseJoinColumnsCheckBox = getWidgetFactory().createButton(composite, JptUiMappingsMessages.JoinTableComposite_overrideDefaultInverseJoinColumns, SWT.CHECK);
 		this.overrideDefaultInverseJoinColumnsCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// do nothing
@@ -237,21 +237,21 @@ public class JoinTableComposite extends BaseJpaComposite
 	}
 	
 	private String buildDefaultJoinColumnLabel(IJoinColumn joinColumn) {
-		return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+		return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 	}
 	
 	private String buildJoinColumnLabel(IJoinColumn joinColumn) {
 		if (joinColumn.getSpecifiedName() == null) {
 			if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-				return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
+				return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
 			}
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
 		}
 		else if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 		}
 		else {
-			return NLS.bind(JpaUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
+			return NLS.bind(JptUiMappingsMessages.JoinTableComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobCheckBox.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobCheckBox.java
index bd5bf86a2c..a81944a32b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobCheckBox.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobCheckBox.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.core.internal.mappings.IBasic;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -51,7 +51,7 @@ public class LobCheckBox extends BaseJpaController
 	protected void buildWidget(Composite parent) {
 		this.button = getWidgetFactory().createButton(
 						parent, 
-						JpaUiMappingsMessages.BasicGeneralSection_lobLabel,
+						JptUiMappingsMessages.BasicGeneralSection_lobLabel,
 						SWT.CHECK);
 		
 		this.button.addSelectionListener(new SelectionListener() {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyComposite.java
index 4213a8c589..a24af8050b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.command.CommandStack;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.core.internal.mappings.IManyToMany;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -108,7 +108,7 @@ public class ManyToManyComposite extends BaseJpaComposite
 	
 	private Control buildJoinTableControl(Composite composite) {
 	    Section section = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    section.setText(JpaUiMappingsMessages.MultiRelationshipMappingComposite_joinTable);
+	    section.setText(JptUiMappingsMessages.MultiRelationshipMappingComposite_joinTable);
 
 		Composite joinTableClient = getWidgetFactory().createComposite(section);
 		section.setClient(joinTableClient);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyComposite.java
index 9e29b8f507..2211a1c42a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.core.internal.mappings.IOneToMany;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -115,7 +115,7 @@ public class OneToManyComposite extends BaseJpaComposite
 	
 	private Control buildJoinTableControl(Composite composite) {
 	    Section section = getWidgetFactory().createSection(composite, SWT.FLAT | ExpandableComposite.TWISTIE | ExpandableComposite.TITLE_BAR);
-	    section.setText(JpaUiMappingsMessages.MultiRelationshipMappingComposite_joinTable);
+	    section.setText(JptUiMappingsMessages.MultiRelationshipMappingComposite_joinTable);
 
 		Composite joinTableClient = getWidgetFactory().createComposite(section);
 		section.setClient(joinTableClient);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderByComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderByComposite.java
index 6d191eaae0..44e458e925 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderByComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderByComposite.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.core.internal.mappings.OrderingType;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -75,7 +75,7 @@ public class OrderByComposite extends BaseJpaComposite  {
 		layout.marginWidth = 0;
 		composite.setLayout(layout);
 		
-		Group orderByGroup = getWidgetFactory().createGroup(composite, JpaUiMappingsMessages.OrderByComposite_orderByGroup);
+		Group orderByGroup = getWidgetFactory().createGroup(composite, JptUiMappingsMessages.OrderByComposite_orderByGroup);
 		orderByGroup.setLayout(new GridLayout(1, false));
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
@@ -119,7 +119,7 @@ public class OrderByComposite extends BaseJpaComposite  {
 	private Button buildNoOrderingRadioButton(Composite parent) {
 		Button button = getWidgetFactory().createButton(
 			parent, 
-			JpaUiMappingsMessages.OrderByComposite_noOrdering, 
+			JptUiMappingsMessages.OrderByComposite_noOrdering, 
 			SWT.RADIO);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -148,7 +148,7 @@ public class OrderByComposite extends BaseJpaComposite  {
 	private Button buildPrimaryKeyOrderingRadioButton(Composite parent) {
 		Button button = getWidgetFactory().createButton(
 			parent, 
-			JpaUiMappingsMessages.OrderByComposite_primaryKeyOrdering, 
+			JptUiMappingsMessages.OrderByComposite_primaryKeyOrdering, 
 			SWT.RADIO);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -175,7 +175,7 @@ public class OrderByComposite extends BaseJpaComposite  {
 	private Button buildCustomOrderingRadioButton(Composite parent) {
 		Button button = getWidgetFactory().createButton(
 			parent, 
-			JpaUiMappingsMessages.OrderByComposite_customOrdering, 
+			JptUiMappingsMessages.OrderByComposite_customOrdering, 
 			SWT.RADIO);
 		button.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
index 5b58f6be1a..ef01e095e1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java
@@ -33,7 +33,7 @@ import org.eclipse.jpt.core.internal.mappings.IOverride;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.Owner;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.swt.SWT;
@@ -96,7 +96,7 @@ public class OverridesComposite extends BaseJpaComposite
 		composite.setLayout(layout);
 		
 		Group attributeOverridesGroup = getWidgetFactory().createGroup(
-			composite, JpaUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
+			composite, JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides);
 		attributeOverridesGroup.setLayout(new GridLayout(2, true));
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = SWT.FILL;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java
index af151f8555..d7a75243b8 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java
@@ -33,7 +33,7 @@ import org.eclipse.jpt.core.internal.mappings.IPrimaryKeyJoinColumn;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
@@ -92,7 +92,7 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 		GridData gridData =  new GridData();
 		this.overrideDefaultJoinColumnsCheckBox = getWidgetFactory().createButton(
 			composite, 
-			JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_overrideDefaultPrimaryKeyJoinColumns, 
+			JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_overrideDefaultPrimaryKeyJoinColumns, 
 			SWT.CHECK);
 		this.overrideDefaultJoinColumnsCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
@@ -118,7 +118,7 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 		this.pkJoinColumnsGroup = 
 			getWidgetFactory().createGroup(
 				composite, 
-				JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_primaryKeyJoinColumn);
+				JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_primaryKeyJoinColumn);
 		this.pkJoinColumnsGroup.setLayout(new GridLayout(2, false));
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
@@ -141,7 +141,7 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.pkJoinColumnsListViewer.getList(), IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS);
 		
 		Button addJoinColumnButton = new Button(this.pkJoinColumnsGroup, SWT.NONE);
-		addJoinColumnButton.setText(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_add);
+		addJoinColumnButton.setText(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_add);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		addJoinColumnButton.setLayoutData(gridData);
@@ -156,7 +156,7 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 		});
 		
 		this.pkJoinColumnsEditButton = new Button(this.pkJoinColumnsGroup, SWT.NONE);
-		this.pkJoinColumnsEditButton.setText(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_edit);
+		this.pkJoinColumnsEditButton.setText(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_edit);
 		this.pkJoinColumnsEditButton.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// do nothing
@@ -171,7 +171,7 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 		this.pkJoinColumnsEditButton.setLayoutData(gridData);
 
 		this.pkJoinColumnsRemoveButton = new Button(this.pkJoinColumnsGroup, SWT.NONE);
-		this.pkJoinColumnsRemoveButton.setText(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_remove);
+		this.pkJoinColumnsRemoveButton.setText(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_remove);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.verticalAlignment = GridData.BEGINNING;
@@ -222,21 +222,21 @@ public class PrimaryKeyJoinColumnsComposite extends BaseJpaComposite
 	}
 	
 	String buildDefaultJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) {
-		return NLS.bind(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+		return NLS.bind(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 	}
 	
 	String buildJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) {
 		if (joinColumn.getSpecifiedName() == null) {
 			if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-				return NLS.bind(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
+				return NLS.bind(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsBothDefault, joinColumn.getName(),joinColumn.getReferencedColumnName());				
 			}
-			return NLS.bind(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
+			return NLS.bind(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsFirstDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());
 		}
 		else if (joinColumn.getSpecifiedReferencedColumnName() == null) {
-			return NLS.bind(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
+			return NLS.bind(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsSecDefault, joinColumn.getName(), joinColumn.getReferencedColumnName());				
 		}
 		else {
-			return NLS.bind(JpaUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
+			return NLS.bind(JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParams, joinColumn.getName(), joinColumn.getReferencedColumnName());					
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SchemaCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SchemaCombo.java
index 312d344f05..67e079c92a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SchemaCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SchemaCombo.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.db.internal.Database;
 import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.osgi.util.NLS;
@@ -138,7 +138,7 @@ public class SchemaCombo extends BaseJpaController
 	@Override
 	protected void buildWidget( Composite parent) {
 		this.combo = getWidgetFactory().createCCombo( parent, SWT.FLAT);
-		this.combo.add( JpaUiMappingsMessages.TableComposite_defaultEmpty);
+		this.combo.add( JptUiMappingsMessages.TableComposite_defaultEmpty);
 		
 		this.combo.addModifyListener( new ModifyListener() {
 			
@@ -258,7 +258,7 @@ public class SchemaCombo extends BaseJpaController
 	protected void populateDefaultSchemaName() {
 		String defaultSchemaName = this.table.getDefaultSchema();
 		int selectionIndex = combo.getSelectionIndex();
-		combo.setItem( 0, NLS.bind( JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultSchemaName));
+		combo.setItem( 0, NLS.bind( JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultSchemaName));
 		if( selectionIndex == 0) {
 			combo.clearSelection();
 			combo.select( 0);
@@ -277,7 +277,7 @@ public class SchemaCombo extends BaseJpaController
 			}
 		}
 		else {
-			if ( ! this.combo.getText().equals( NLS.bind( JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultSchemaName))) {
+			if ( ! this.combo.getText().equals( NLS.bind( JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultSchemaName))) {
 				this.combo.select( 0);
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java
index bf78cbfc9b..14be07b492 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java
@@ -16,7 +16,7 @@ import org.eclipse.jpt.core.internal.mappings.ISecondaryTable;
 import org.eclipse.jpt.db.internal.ConnectionProfile;
 import org.eclipse.jpt.db.internal.Database;
 import org.eclipse.jpt.db.internal.Schema;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -63,7 +63,7 @@ public class SecondaryTableDialog extends Dialog {
 	}
 	
 	protected String getTitle() {
-		return JpaUiMappingsMessages.SecondaryTableDialog_editSecondaryTable;
+		return JptUiMappingsMessages.SecondaryTableDialog_editSecondaryTable;
 	}
 	
 	protected Control createDialogArea(Composite parent) {
@@ -72,7 +72,7 @@ public class SecondaryTableDialog extends Dialog {
 		gridLayout.numColumns = 2;
 		
 		Label nameLabel = new Label(composite, SWT.LEFT);
-		nameLabel.setText(JpaUiMappingsMessages.SecondaryTableDialog_name);
+		nameLabel.setText(JptUiMappingsMessages.SecondaryTableDialog_name);
 		GridData gridData = new GridData();
 		nameLabel.setLayoutData(gridData);
 		
@@ -84,7 +84,7 @@ public class SecondaryTableDialog extends Dialog {
 		populateNameCombo();
 	
 		Label catalogLabel = new Label(composite, SWT.LEFT);
-		catalogLabel.setText(JpaUiMappingsMessages.SecondaryTableDialog_catalog);
+		catalogLabel.setText(JptUiMappingsMessages.SecondaryTableDialog_catalog);
 		gridData = new GridData();
 		catalogLabel.setLayoutData(gridData);
 		
@@ -96,7 +96,7 @@ public class SecondaryTableDialog extends Dialog {
 		populateCatalogCombo();
 
 		Label schemaLabel = new Label(composite, SWT.LEFT);
-		schemaLabel.setText(JpaUiMappingsMessages.SecondaryTableDialog_schema);
+		schemaLabel.setText(JptUiMappingsMessages.SecondaryTableDialog_schema);
 		gridData = new GridData();
 		schemaLabel.setLayoutData(gridData);
 		
@@ -148,7 +148,7 @@ public class SecondaryTableDialog extends Dialog {
 
 	protected void populateSchemaCombo() {
 		if (getSecondaryTable() != null) {
-			this.schemaCombo.add(NLS.bind(JpaUiMappingsMessages.SecondaryTableDialog_defaultSchema, getSecondaryTable().getDefaultSchema()));
+			this.schemaCombo.add(NLS.bind(JptUiMappingsMessages.SecondaryTableDialog_defaultSchema, getSecondaryTable().getDefaultSchema()));
 		}
 		
 		Database database = this.getDatabase();
@@ -172,7 +172,7 @@ public class SecondaryTableDialog extends Dialog {
 	
 	protected void populateCatalogCombo() {
 		if (getSecondaryTable() != null) {
-			this.catalogCombo.add(NLS.bind(JpaUiMappingsMessages.SecondaryTableDialog_defaultCatalog, getSecondaryTable().getDefaultCatalog()));
+			this.catalogCombo.add(NLS.bind(JptUiMappingsMessages.SecondaryTableDialog_defaultCatalog, getSecondaryTable().getDefaultCatalog()));
 		}
 		Database database = this.getDatabase();
 		
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java
index 0fd16b87c5..1f0e30d5a5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java
@@ -32,7 +32,7 @@ import org.eclipse.jpt.core.internal.mappings.ISecondaryTable;
 import org.eclipse.jpt.core.internal.mappings.ITable;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -100,7 +100,7 @@ public class SecondaryTablesComposite extends BaseJpaComposite
 		//PlatformUI.getWorkbench().getHelpSystem().setHelp(this.secondaryTablesListViewer.getList(), IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS);
 		
 		this.addButton = new Button(composite, SWT.NONE);
-		this.addButton.setText(JpaUiMappingsMessages.SecondaryTablesComposite_add);
+		this.addButton.setText(JptUiMappingsMessages.SecondaryTablesComposite_add);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		this.addButton.setLayoutData(gridData);
@@ -115,7 +115,7 @@ public class SecondaryTablesComposite extends BaseJpaComposite
 		});
 		
 		this.editButton = new Button(composite, SWT.NONE);
-		this.editButton.setText(JpaUiMappingsMessages.SecondaryTablesComposite_edit);
+		this.editButton.setText(JptUiMappingsMessages.SecondaryTablesComposite_edit);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		this.editButton.setLayoutData(gridData);
@@ -130,7 +130,7 @@ public class SecondaryTablesComposite extends BaseJpaComposite
 		});
 
 		this.removeButton = new Button(composite, SWT.NONE);
-		this.removeButton.setText(JpaUiMappingsMessages.SecondaryTablesComposite_remove);
+		this.removeButton.setText(JptUiMappingsMessages.SecondaryTablesComposite_remove);
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.verticalAlignment = GridData.BEGINNING;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java
index 888bcd2f35..288f974296 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.internal.mappings.ISequenceGenerator;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.db.internal.ConnectionProfile;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.events.ModifyEvent;
@@ -62,7 +62,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene
 		
 		GridLayout layout = new GridLayout(2, false);
 		composite.setLayout(layout);
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.SequenceGeneratorComposite_name);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.SequenceGeneratorComposite_name);
 		
 		this.nameViewer = buildNameViewer(composite);
 		GridData gridData = new GridData();
@@ -71,7 +71,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene
 		this.nameViewer.getTextWidget().setLayoutData(gridData);
 		helpSystem.setHelp(nameViewer.getTextWidget(), IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_NAME);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.SequenceGeneratorComposite_sequence);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.SequenceGeneratorComposite_sequence);
 		
 		this.sequenceNameCombo = buildSequenceNameCombo(composite);
 		gridData = new GridData();
@@ -157,7 +157,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene
 		if (this.getGenerator() == null) {
 			return;
 		}
-		this.sequenceNameCombo.setItem(0, JpaUiMappingsMessages.SequenceGeneratorComposite_default);
+		this.sequenceNameCombo.setItem(0, JptUiMappingsMessages.SequenceGeneratorComposite_default);
 		if (this.getConnectionProfile().isConnected()) {
 //			this.sequenceNameCombo.remove(1, this.sequenceNameCombo.getItemCount() - 1);
 //			Schema schema = getConnectionProfile().getDatabase().schemaNamed(getGenerator().getJpaProject().getSchemaName());
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableCombo.java
index 952bfb9ebc..89fae1b5f1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableCombo.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.db.internal.Database;
 import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -136,7 +136,7 @@ public class TableCombo extends BaseJpaController
 	@Override
 	protected void buildWidget(Composite parent) {
 		this.combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		this.combo.add(JpaUiMappingsMessages.TableComposite_defaultEmpty);
+		this.combo.add(JptUiMappingsMessages.TableComposite_defaultEmpty);
 		this.combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				if (isPopulating()) {
@@ -263,7 +263,7 @@ public class TableCombo extends BaseJpaController
 		}
 		String defaultTableName = table.getDefaultName();
 		int selectionIndex = combo.getSelectionIndex();
-		combo.setItem(0, NLS.bind(JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultTableName));
+		combo.setItem(0, NLS.bind(JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultTableName));
 		if (selectionIndex == 0) {
 			//combo text does not update when switching between 2 mappings of the same type
 			//that both have a default column name.  clear the selection and then set it again
@@ -284,7 +284,7 @@ public class TableCombo extends BaseJpaController
 			}
 		}
 		else {
-			if (!this.combo.getText().equals(NLS.bind(JpaUiMappingsMessages.TableComposite_defaultWithOneParam, defaultTableName))) {
+			if (!this.combo.getText().equals(NLS.bind(JptUiMappingsMessages.TableComposite_defaultWithOneParam, defaultTableName))) {
 				this.combo.select(0);
 			}
 		}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java
index 954e01c470..cc6f99ae00 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jpt.core.internal.mappings.ITable;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaComposite;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -44,7 +44,7 @@ public class TableComposite extends BaseJpaComposite
 		layout.marginWidth = 0;		
 		composite.setLayout(layout);	
 		
-		Group columnGroup = getWidgetFactory().createGroup(composite, JpaUiMappingsMessages.TableComposite_tableSection);
+		Group columnGroup = getWidgetFactory().createGroup(composite, JptUiMappingsMessages.TableComposite_tableSection);
 		layout = new GridLayout();
 		layout.marginHeight = 0;				
 		columnGroup.setLayout(layout);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java
index 93d3744e6f..5c19fe695f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.db.internal.Database;
 import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
@@ -71,7 +71,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		
 		IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.TableGeneratorComposite_name);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.TableGeneratorComposite_name);
 		
 		this.nameViewer = buildNameViewer(composite);
 		GridData gridData = new GridData();
@@ -80,7 +80,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		this.nameViewer.getTextWidget().setLayoutData(gridData);
 		helpSystem.setHelp(this.nameViewer.getTextWidget(), IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_NAME);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.TableGeneratorComposite_table);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.TableGeneratorComposite_table);
 		
 		this.tableNameCombo = buildTableNameCombo(composite);
 		gridData = new GridData();
@@ -89,7 +89,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		this.tableNameCombo.setLayoutData(gridData);
 		helpSystem.setHelp(this.tableNameCombo, IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.TableGeneratorComposite_pkColumn);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.TableGeneratorComposite_pkColumn);
 		
 		this.pkColumnNameCombo = buildPkColumnNameCombo(composite);
 		gridData = new GridData();
@@ -98,7 +98,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		this.pkColumnNameCombo.setLayoutData(gridData);
 		helpSystem.setHelp(this.pkColumnNameCombo, IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.TableGeneratorComposite_valueColumn);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.TableGeneratorComposite_valueColumn);
 		
 		this.valueColumnNameCombo = buildValueColumnNameCombo(composite);
 		gridData = new GridData();
@@ -107,7 +107,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		this.valueColumnNameCombo.setLayoutData(gridData);
 		helpSystem.setHelp(this.valueColumnNameCombo, IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN);
 		
-		getWidgetFactory().createLabel(composite, JpaUiMappingsMessages.TableGeneratorComposite_pkColumnValue);
+		getWidgetFactory().createLabel(composite, JptUiMappingsMessages.TableGeneratorComposite_pkColumnValue);
 		
 		this.pkColumnValueCombo = buildPkColumnValueCombo(composite);
 		gridData = new GridData();
@@ -119,7 +119,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 
 	private CCombo buildTableNameCombo(Composite parent) {
 		CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TableGeneratorComposite_default);
+		combo.add(JptUiMappingsMessages.TableGeneratorComposite_default);
 		combo.select(0);
 		combo.addModifyListener(buildTableNameListener());
 		return combo;
@@ -127,7 +127,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 
 	private CCombo buildPkColumnNameCombo(Composite parent) {
 		CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TableGeneratorComposite_default);
+		combo.add(JptUiMappingsMessages.TableGeneratorComposite_default);
 		combo.select(0);
 		combo.addModifyListener(buildPkColumnNameListener());
 		return combo;
@@ -135,7 +135,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 
 	private CCombo buildValueColumnNameCombo(Composite parent) {
 		CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TableGeneratorComposite_default);
+		combo.add(JptUiMappingsMessages.TableGeneratorComposite_default);
 		combo.select(0);
 		combo.addModifyListener(buildValueColumnNameListener());
 		return combo;
@@ -143,7 +143,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 
 	private CCombo buildPkColumnValueCombo(Composite parent) {
 		CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TableGeneratorComposite_default);
+		combo.add(JptUiMappingsMessages.TableGeneratorComposite_default);
 		combo.select(0);
 		combo.addModifyListener(buildPkColumnValueListener());
 		return combo;
@@ -386,7 +386,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		this.pkColumnNameCombo.remove(1, this.pkColumnNameCombo.getItemCount() - 1);
 		
 		if (this.getConnectionProfile().isConnected()) {
-			if (!this.tableNameCombo.getText().equals(JpaUiMappingsMessages.TableGeneratorComposite_default)) { // hmm,
+			if (!this.tableNameCombo.getText().equals(JptUiMappingsMessages.TableGeneratorComposite_default)) { // hmm,
 				// if
 				// they
 				// actually
@@ -427,7 +427,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator>
 		}
 		if (this.getConnectionProfile().isConnected()) {
 			this.valueColumnNameCombo.remove(1, this.valueColumnNameCombo.getItemCount() - 1);
-			if (!this.tableNameCombo.getText().equals(JpaUiMappingsMessages.TableGeneratorComposite_default)) { // hmm,
+			if (!this.tableNameCombo.getText().equals(JptUiMappingsMessages.TableGeneratorComposite_default)) { // hmm,
 				// if
 				// they
 				// actually
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityChooser.java
index 9ea5a27f8e..dd5e76a6ee 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityChooser.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityChooser.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.internal.mappings.IRelationshipMapping;
 import org.eclipse.jpt.core.internal.mappings.JpaCoreMappingsPackage;
 import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
 import org.eclipse.jpt.ui.internal.details.BaseJpaController;
-import org.eclipse.jpt.ui.internal.mappings.JpaUiMappingsMessages;
+import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.BusyIndicator;
@@ -89,7 +89,7 @@ public class TargetEntityChooser extends BaseJpaController
 	
 	protected CCombo buildTargetEntityCombo(Composite parent) {
 		final CCombo combo = getWidgetFactory().createCCombo(parent, SWT.FLAT);
-		combo.add(JpaUiMappingsMessages.TargetEntityChooser_defaultEmpty);
+		combo.add(JptUiMappingsMessages.TargetEntityChooser_defaultEmpty);
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(combo, IJpaHelpContextIds.MAPPING_TARGET_ENTITY);
 		combo.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -162,7 +162,7 @@ public class TargetEntityChooser extends BaseJpaController
 			return;
 		}
 		String targetEntity = this.relationshipMapping.getSpecifiedTargetEntity();
-		this.targetEntityCombo.setItem(0, NLS.bind(JpaUiMappingsMessages.TargetEntityChooser_defaultWithOneParam, this.relationshipMapping.getDefaultTargetEntity()));
+		this.targetEntityCombo.setItem(0, NLS.bind(JptUiMappingsMessages.TargetEntityChooser_defaultWithOneParam, this.relationshipMapping.getDefaultTargetEntity()));
 		if (targetEntity != null) {
 			if (!this.targetEntityCombo.getText().equals(targetEntity)) {
 				this.targetEntityCombo.setText(targetEntity);
@@ -184,7 +184,7 @@ public class TargetEntityChooser extends BaseJpaController
 	//for example of the hyperlink opening a resource
 	protected Button buildTargetEntitySelectionButton(Composite parent) {
 		Button button = new Button(parent, SWT.PUSH);
-		button.setText(JpaUiMappingsMessages.TargetEntityChooser_browse);
+		button.setText(JptUiMappingsMessages.TargetEntityChooser_browse);
 		button.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				browse();