convert JptJpaUiWizardsEntityGenMessages to all-caps

21 files changed, 313 insertions, 313 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/EclipseLinkDynamicTableGenPanel.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/EclipseLinkDynamicTableGenPanel.java
index 431ea70e63..65c7d18ff6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/EclipseLinkDynamicTableGenPanel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/EclipseLinkDynamicTableGenPanel.java
@@ -29,7 +29,7 @@ public class EclipseLinkDynamicTableGenPanel
 	@Override
 	protected void createTableMappingPropertiesGroup(Composite composite, int columns) {
 		Group parent = new Group(composite, SWT.NONE );
-		parent.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_tableMapping);
+		parent.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TABLE_MAPPING);
 		parent.setLayout(new GridLayout(columns, false));
 		GridData layoutData = new GridData();
 		layoutData.horizontalSpan = columns;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui.properties b/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui.properties
index 575ef7ff1d..d8c9d9abf1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui.properties
@@ -56,7 +56,7 @@ General_refresh=Refresh Tables
 
 GenerateDDLWizard_title=Generate Tables from Entities
 
-GenerateEntitiesWizard_generateEntities=Generate Entities
+GENERATE_ENTITIES_WIZARD_generateEntities=Generate Entities
 GenerateEntitiesWizardPage_chooseEntityTable=Choose tables to generate entities from.
 GenerateEntitiesWizardPage_generateEntities=Generate Entities from Tables
 GenerateEntitiesWizardPage_synchronizeClasses=Synchronize classes in persistence.xml
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui_wizards_entity_gen.properties b/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui_wizards_entity_gen.properties
index eb2d6353ff..6c058c7d3d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui_wizards_entity_gen.properties
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_jpa_ui_wizards_entity_gen.properties
@@ -10,112 +10,112 @@
 
 # JptJpaUiWizardsEntityGenMessages
 
-cardinality=Car&dinality:
-property=P&roperty:
-cascade=&Cascade:
-connection=&Connection:
-schema=&Schema:
-schemaInfo=(Note: You must have an active connection to select schema.)
-addConnectionLink=Add connections...
-connectLink=Connect
-connectingToDatabase=Connecting to database
-manyToOne=&Many to one
-manyToMany=Man&y to many
-oneToMany=&One to many
-oneToOne=&One to one
-manyToOneDesc=Each %s has many %s.
-oneToOneDesc=There is one %s per %s.
-manyToManyDesc=Each %s has many %s, and each %s has many %s.
-
-add=&Add
-remove=&Remove
-
-GenerateEntitiesWizard_generateEntities=Generate Custom Entities
-
-GenerateEntitiesWizard_selectJPAProject=JPA Project Selection
-GenerateEntitiesWizard_selectJPAProject_msg=Select a JPA project.
-
-GenerateEntitiesWizard_tableSelectPage_selectTable=Select Tables
-GenerateEntitiesWizard_tableSelectPage_chooseEntityTable=Select tables from which entities will be generated.
-GenerateEntitiesWizard_tableSelectPage_updatePersistenceXml=List generated classes in persistence.xml
-GenerateEntitiesWizard_tableSelectPage_tables=&Tables:
-GenerateEntitiesWizard_tableSelectPage_tableColumn=Table
-GenerateEntitiesWizard_tableSelectPage_Restore_Defaults=Restore Defaults
-GenerateEntitiesWizard_tableSelectPage_tableSearch=type filter text
-
-GenerateEntitiesWizard_tableSelectPage_getTables_jobName=Get tables
-GenerateEntitiesWizard_tableSelectPage_getTables_taskName=Getting tables
-GenerateEntitiesWizard_tableSelectPage_getTables_subTaskName=Retrieving tables from schema {0}...
-GenerateEntitiesWizard_tableSelectPage_statusUpdate_taskName=Updating
-
-GenerateEntitiesWizard_assocPage_title=Table Associations
-GenerateEntitiesWizard_assocPage_label=Table &associations
-GenerateEntitiesWizard_assocPage_desc=Edit a table association by selecting it and modifying the controls in the editing panel.
-GenerateEntitiesWizard_assocPage_newAssoc=New Association
-GenerateEntitiesWizard_assocPage_delAssoc=Delete Selected Association
-
-
-GenerateEntitiesWizard_defaultTablePage_title=Customize Defaults
-GenerateEntitiesWizard_defaultTablePage_tableMapping=Mapping defaults
-GenerateEntitiesWizard_defaultTablePage_domainJavaClass=Domain java class
-
-GenerateEntitiesWizard_defaultTablePage_desc=Optionally customize aspects of entities that will be generated by default from database tables. A Java package should be specified.
-GenerateEntitiesWizard_defaultTablePage_access=Entity &access:
-GenerateEntitiesWizard_defaultTablePage_fetch=Associations &fetch:
-GenerateEntitiesWizard_defaultTablePage_fetchDefault=&Default
-GenerateEntitiesWizard_defaultTablePage_collType=Collection properties &type:
-GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations = Always generate optional JPA annotations and DDL parameters
-GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations_desc =  Generate optional JPA annotations and DDL parameters like 'unique', 'nullable', 'length', 'precision' and 'scale', which are optional and only used by automatic table creation to specify table creation data.
-GenerateEntitiesWizard_defaultTablePage_keyGen=Key &generator:
-GenerateEntitiesWizard_defaultTablePage_sequence=Sequence &name:
-GenerateEntitiesWizard_defaultTablePage_sequenceNote=You can use the patterns %s and/or %s in the sequence name.\n\
+CARDINALITY=Car&dinality:
+PROPERTY=P&roperty:
+CASCADE=&Cascade:
+CONNECTION=&Connection:
+SCHEMA=&Schema:
+SCHEMA_INFO=(Note: You must have an active connection to select schema.)
+ADD_CONNECTION_LINK=Add connections...
+CONNECT_LINK=Connect
+CONNECTING_TO_DATABASE=Connecting to database
+MANY_TO_ONE=&Many to one
+MANY_TO_MANY=Man&y to many
+ONE_TO_MANY=&One to many
+ONE_TO_ONE=&One to one
+MANY_TO_ONE_DESC=Each %s has many %s.
+ONE_TO_ONE_DESC=There is one %s per %s.
+MANY_TO_MANY_DESC=Each %s has many %s, and each %s has many %s.
+
+ADD=&Add
+REMOVE=&Remove
+
+GENERATE_ENTITIES_WIZARD_GENERATE_ENTITIES=Generate Custom Entities
+
+GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT=JPA Project Selection
+GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT_MSG=Select a JPA project.
+
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_SELECT_TABLE=Select Tables
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_CHOOSE_ENTITY_TABLE=Select tables from which entities will be generated.
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_UPDATE_PERSISTENCE_XML=List generated classes in persistence.xml
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLES=&Tables:
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_COLUMN=Table
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_RESTORE_DEFAULTS=Restore Defaults
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_SEARCH=type filter text
+
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_JOB_NAME=Get tables
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_TASK_NAME=Getting tables
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_SUB_TASK_NAME=Retrieving tables from schema {0}...
+GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_STATUS_UPDATE_TASK_NAME=Updating
+
+GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_TITLE=Table Associations
+GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_LABEL=Table &associations
+GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DESC=Edit a table association by selecting it and modifying the controls in the editing panel.
+GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_NEW_ASSOC=New Association
+GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DEL_ASSOC=Delete Selected Association
+
+
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TITLE=Customize Defaults
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TABLE_MAPPING=Mapping defaults
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DOMAIN_JAVA_CLASS=Domain java class
+
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DESC=Optionally customize aspects of entities that will be generated by default from database tables. A Java package should be specified.
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_ACCESS=Entity &access:
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH=Associations &fetch:
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH_DEFAULT=&Default
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_COLLECTION_TYPE=Collection properties &type:
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS=Always generate optional JPA annotations and DDL parameters
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS_DESC=Generate optional JPA annotations and DDL parameters like 'unique', 'nullable', 'length', 'precision' and 'scale', which are optional and only used by automatic table creation to specify table creation data.
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_KEY_GEN=Key &generator:
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE=Sequence &name:
+GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE_NOTE=You can use the patterns %s and/or %s in the sequence name.\n\
 			These patterns will be replaced by the table name and the primary key \n\
 			column name when a table mapping is generated.
 
 
-GenerateEntitiesWizard_tablesAndColumnsPage_title=Customize Individual Entities
-GenerateEntitiesWizard_tablesAndColumnsPage_desc=Customize detail of individual entities by selecting the associated tables or columns and changing values in the editing panel.
-GenerateEntitiesWizard_tablesAndColumnsPage_labelTableAndColumns=&Tables and columns
-
-GenerateEntitiesWizard_tablePanel_className=&Class name:
-GenerateEntitiesWizard_colPanel_genProp=Generate this property
-GenerateEntitiesWizard_colPanel_colMapping=Column mapping
-GenerateEntitiesWizard_colPanel_propName=Property &name:
-GenerateEntitiesWizard_colPanel_propType=Mapping t&ype:
-GenerateEntitiesWizard_colPanel_mapKind=Mapping &kind:
-GenerateEntitiesWizard_colPanel_beanProp=Domain Java Class
-GenerateEntitiesWizard_colPanel_getterScope=Getter scope:
-GenerateEntitiesWizard_colPanel_setterScope=Setter scope:
-GenerateEntitiesWizard_colPanel_colUpdateable=Column is &updatable
-GenerateEntitiesWizard_colPanel_colInsertable=Column is &insertable
-
-GenerateEntitiesWizard_newAssoc_title=Create New Association
-
-GenerateEntitiesWizard_newAssoc_tablesPage_title=Association Tables
-GenerateEntitiesWizard_newAssoc_tablesPage_desc=Specify the association tables.
-GenerateEntitiesWizard_newAssoc_tablesPage_assocKind=Association kind
-GenerateEntitiesWizard_newAssoc_tablesPage_assocTables=Association &tables:
-GenerateEntitiesWizard_newAssoc_tablesPage_table1=Table &1:
-GenerateEntitiesWizard_newAssoc_tablesPage_table2=Table &2:
-GenerateEntitiesWizard_newAssoc_tablesPage_intermediateTable=Join table:
-GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_table=Specified table ''{0}'' does not exist
-GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_join_table=Specified join table ''{0}'' does not exist
-GenerateEntitiesWizard_newAssoc_tablesPage_simpleAssoc=&Simple association
-GenerateEntitiesWizard_newAssoc_tablesPage_m2mAssoc=&Many to many association
-
-GenerateEntitiesWizard_newAssoc_cardinalityPage_title=Association Cardinality
-GenerateEntitiesWizard_newAssoc_cardinalityPage_desc=Specify the association cardinality.
-
-GenerateEntitiesWizard_newAssoc_colsPage_title=Join Columns
-GenerateEntitiesWizard_newAssoc_colsPage_desc=Specify the join columns.
-GenerateEntitiesWizard_newAssoc_colsPage_label=Specify the join columns between the %s and %s tables:
-
-GenerateEntitiesWizard_assocEditor_entityRef=Generate a reference to %s in %s
-GenerateEntitiesWizard_assocEditor_setRef=Generate a reference to a collection of %s in %s
-GenerateEntitiesWizard_assocEditor_tableJoin=Table &join:
-GenerateEntitiesWizard_assocEditor_joinedWhen=The table rows are joined when:\n%s
-GenerateEntitiesWizard_assocEditor_genAssoc=Generate &this association
-
-selectCascadeDlgTitle=Select Cascade
-selectTableDlgTitle=Table Selection
-selectTableDlgDesc=&Select a table:
+GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_TITLE=Customize Individual Entities
+GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_DESC=Customize detail of individual entities by selecting the associated tables or columns and changing values in the editing panel.
+GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_LABEL_TABLE_AND_COLUMNS=&Tables and columns
+
+GENERATE_ENTITIES_WIZARD_TABLE_PANEL_CLASS_NAME=&Class name:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_GEN_PROP=Generate this property
+GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_MAPPING=Column mapping
+GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_NAME=Property &name:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_TYPE=Mapping t&ype:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_MAP_KIND=Mapping &kind:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_BEAN_PROP=Domain Java Class
+GENERATE_ENTITIES_WIZARD_COL_PANEL_GETTER_SCOPE=Getter scope:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_SETTER_SCOPE=Setter scope:
+GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_UPDATEABLE=Column is &updatable
+GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_INSERTABLE=Column is &insertable
+
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TITLE=Create New Association
+
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TITLE=Association Tables
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_DESC=Specify the association tables.
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_KIND=Association kind
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_TABLES=Association &tables:
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE1=Table &1:
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE2=Table &2:
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_INTERMEDIATE_TABLE=Join table:
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_TABLE=Specified table ''{0}'' does not exist
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_JOIN_TABLE=Specified join table ''{0}'' does not exist
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_SIMPLE_ASSOC=&Simple association
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_M2M_ASSOC=&Many to many association
+
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_TITLE=Association Cardinality
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_DESC=Specify the association cardinality.
+
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_TITLE=Join Columns
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_DESC=Specify the join columns.
+GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL=Specify the join columns between the %s and %s tables:
+
+GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_ENTITY_REF=Generate a reference to %s in %s
+GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_SET_REF=Generate a reference to a collection of %s in %s
+GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_TABLE_JOIN=Table &join:
+GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_JOINED_WHEN=The table rows are joined when:\n%s
+GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_GEN_ASSOC=Generate &this association
+
+SELECT_CASCADE_DLG_TITLE=Select Cascade
+SELECT_TABLE_DLG_TITLE=Table Selection
+SELECT_TABLE_DLG_DESC=&Select a table:
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiMessages.java
index 7c3bd2e246..cdb1e97d59 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JptJpaUiMessages.java
@@ -59,7 +59,7 @@ public class JptJpaUiMessages {
 	public static String General_selectAll;
 	public static String General_refresh;
 	public static String GenerateDDLWizard_title;
-	public static String GenerateEntitiesWizard_generateEntities;
+	public static String GENERATE_ENTITIES_WIZARD_generateEntities;
 	public static String GenerateEntitiesWizardPage_chooseEntityTable;
 	public static String GenerateEntitiesWizardPage_entityNameColumn;
 	public static String GenerateEntitiesWizardPage_generateEntities;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationFigure.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationFigure.java
index 9008339e70..68d76098f3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationFigure.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationFigure.java
@@ -184,11 +184,11 @@ class AssociationFigure extends Button {
 		String referrerTableName = association.getReferrerTableName();
 		String referencedTable = association.getReferencedTableName();
 		if( cardinality.equals(Association.MANY_TO_ONE ) ){
-			text = String.format( JptJpaUiWizardsEntityGenMessages.manyToOneDesc, referencedTable , referrerTableName ); 
+			text = String.format( JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE_DESC, referencedTable , referrerTableName ); 
 		}else if( cardinality.equals(Association.ONE_TO_ONE ) ){
-			text = String.format( JptJpaUiWizardsEntityGenMessages.oneToOneDesc, referrerTableName, referencedTable );
+			text = String.format( JptJpaUiWizardsEntityGenMessages.ONE_TO_ONE_DESC, referrerTableName, referencedTable );
 		}else if( cardinality.equals(Association.MANY_TO_MANY) ){
-			text = String.format( JptJpaUiWizardsEntityGenMessages.manyToManyDesc, referrerTableName, referencedTable, referencedTable, referrerTableName );			
+			text = String.format( JptJpaUiWizardsEntityGenMessages.MANY_TO_MANY_DESC, referrerTableName, referencedTable, referencedTable, referrerTableName );			
 		}
 		
 		if( association.isCustom() ){
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
index 2d0baa53f9..31a497579d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/AssociationTablesPage.java
@@ -54,8 +54,8 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 	public AssociationTablesPage(ORMGenCustomizer customizer, ResourceManager resourceManager) {
 		super(customizer,  "AssociationTablesPage");
 		this.resourceManager = resourceManager;
-		setTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_title);
-		setDescription(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_desc);
+		setTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TITLE);
+		setDescription(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_DESC);
 	}
 
 	public void createControl(Composite composite) {
@@ -70,10 +70,10 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 		assocKindGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		assocKindGroup.setLayout(layout);
 		WorkbenchTools.setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_ASSOCIATION_TABLES);
-		assocKindGroup.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_assocKind);
+		assocKindGroup.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_KIND);
 
-		simpleAssoBtn = createButton(assocKindGroup, 3, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_simpleAssoc, SWT.RADIO);
-		mtmAssoBtn = createButton(assocKindGroup, 3, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_m2mAssoc, SWT.RADIO);
+		simpleAssoBtn = createButton(assocKindGroup, 3, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_SIMPLE_ASSOC, SWT.RADIO);
+		mtmAssoBtn = createButton(assocKindGroup, 3, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_M2M_ASSOC, SWT.RADIO);
 
 		
 		Group assocTablesGroup = new Group(parent, SWT.NULL);
@@ -84,9 +84,9 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 		assocTablesGroup.setLayout(layout);
 		
 		
-		assocTablesGroup.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_assocTables );
+		assocTablesGroup.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_TABLES );
 		
-		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_table1);
+		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE1);
 		table1TextField = createText(assocTablesGroup, 1);
 		table1TextField.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -111,7 +111,7 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 			}
 		});
 
-		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_table2);
+		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE2);
 		table2TextField = createText(assocTablesGroup, 1);
 		table2TextField.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -135,7 +135,7 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 			}
 		});
 		
-		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_intermediateTable );
+		createLabel(assocTablesGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_INTERMEDIATE_TABLE );
 		joinTableTextField = createText(assocTablesGroup, 1);
 		joinTableTextField.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
@@ -222,16 +222,16 @@ public class AssociationTablesPage extends NewAssociationWizardPage {
 
 	private String buildTableErrorMessage() {
 		if ( !IterableTools.contains(this.customizer.getTableNames(), this.table1TextField.getText()) ) {
-			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_table, this.table1TextField.getText());
+			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_TABLE, this.table1TextField.getText());
 		} else if ( !IterableTools.contains(this.customizer.getTableNames(), this.table2TextField.getText()) ) {
-			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_table, this.table2TextField.getText());
+			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_TABLE, this.table2TextField.getText());
 		}
 		return null;
 	}
 	
 	private String buildJoinTableErrorMessage() {
 		if (!IterableTools.contains(this.getAllTableNames(this.customizer.getSchema()), this.joinTableTextField.getText())) {
-			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_join_table, this.joinTableTextField.getText());
+			return NLS.bind(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_JOIN_TABLE, this.joinTableTextField.getText());
 		}
 		return null;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CardinalityPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CardinalityPage.java
index 04205cf73a..7efe40f40b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CardinalityPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CardinalityPage.java
@@ -36,8 +36,8 @@ public class CardinalityPage extends NewAssociationWizardPage {
 	
 	protected CardinalityPage(ORMGenCustomizer customizer) {
 		super( customizer , "CardinalityPage" );
-		setTitle(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_cardinalityPage_title);
-		setDescription( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_cardinalityPage_desc);
+		setTitle(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_TITLE);
+		setDescription( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_DESC);
 	}
 
 	public void createControl(Composite parent) {
@@ -51,26 +51,26 @@ public class CardinalityPage extends NewAssociationWizardPage {
 		WorkbenchTools.setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_ASSOCIATION_CARDINALITY);
 
 		CardinalitySelectionListener selectionListener = new CardinalitySelectionListener();
-		cardinalityButtons[0] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.manyToOne);
+		cardinalityButtons[0] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE);
 		cardinalityButtons[0].addSelectionListener( selectionListener );
 		//Default cardinality is MTO
 		cardinalityButtons[0].setSelection(true);
 		getWizardDataModel().put(NewAssociationWizard.ASSOCIATION_CADINALITY, Association.MANY_TO_ONE);		
 
-		mtoDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.manyToOneDesc);
+		mtoDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE_DESC);
 		
-		cardinalityButtons[1] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.oneToMany);
+		cardinalityButtons[1] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.ONE_TO_MANY);
 		cardinalityButtons[1].addSelectionListener( selectionListener );
 		
-		otmDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.manyToOneDesc);
+		otmDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE_DESC);
 
-		cardinalityButtons[2] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.oneToOne);
+		cardinalityButtons[2] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.ONE_TO_ONE);
 		cardinalityButtons[2].addSelectionListener( selectionListener );
 
-		otoDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.oneToOneDesc);
+		otoDescLabel = createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.ONE_TO_ONE_DESC);
 
-		cardinalityButtons[3] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.manyToMany);
-		mtmDescLabel= createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.manyToManyDesc);
+		cardinalityButtons[3] = createRadioButton( composite, 1, JptJpaUiWizardsEntityGenMessages.MANY_TO_MANY);
+		mtmDescLabel= createLabel(composite,1, JptJpaUiWizardsEntityGenMessages.MANY_TO_MANY_DESC);
 		
 		setControl(composite);
 		this.setPageComplete( true );
@@ -106,14 +106,14 @@ public class CardinalityPage extends NewAssociationWizardPage {
 
 	private void updateDescriptionText(String s1, String s2) {
 		//MTO
-		String msg = String.format(JptJpaUiWizardsEntityGenMessages.manyToOneDesc, s2, s1);
+		String msg = String.format(JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE_DESC, s2, s1);
 		mtoDescLabel.setText( msg );
 		//OTM
-		msg = String.format(JptJpaUiWizardsEntityGenMessages.manyToOneDesc, s1, s2);
+		msg = String.format(JptJpaUiWizardsEntityGenMessages.MANY_TO_ONE_DESC, s1, s2);
 		otmDescLabel.setText( msg );
-		msg = String.format(JptJpaUiWizardsEntityGenMessages.oneToOneDesc, s1, s2);
+		msg = String.format(JptJpaUiWizardsEntityGenMessages.ONE_TO_ONE_DESC, s1, s2);
 		otoDescLabel.setText( msg );
-		msg = String.format(JptJpaUiWizardsEntityGenMessages.manyToManyDesc, s1, s2, s2, s1);
+		msg = String.format(JptJpaUiWizardsEntityGenMessages.MANY_TO_MANY_DESC, s1, s2, s2, s1);
 		mtmDescLabel.setText( msg );
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CascadeDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CascadeDialog.java
index cdd7f81ced..840102925c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CascadeDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/CascadeDialog.java
@@ -69,7 +69,7 @@ public class CascadeDialog extends TrayDialog {
      */
     protected void configureShell(Shell newShell) {
         super.configureShell(newShell);
-        newShell.setText(JptJpaUiWizardsEntityGenMessages.selectCascadeDlgTitle);
+        newShell.setText(JptJpaUiWizardsEntityGenMessages.SELECT_CASCADE_DLG_TITLE);
 		WorkbenchTools.setHelp(newShell, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_SELECT_CASCADE);
     }
 	
@@ -101,7 +101,7 @@ public class CascadeDialog extends TrayDialog {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.widthHint = 275;
 		group.setLayoutData(gd);
-		group.setText(JptJpaUiWizardsEntityGenMessages.cascade);
+		group.setText(JptJpaUiWizardsEntityGenMessages.CASCADE);
 
 		for( int i=0; i< ALL_CASCADES.length; i ++ ){
 			Button checkbox = new Button(group, SWT.CHECK);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/ColumnGenPanel.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/ColumnGenPanel.java
index ecefbad005..c2ab07becd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/ColumnGenPanel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/ColumnGenPanel.java
@@ -232,7 +232,7 @@ public class ColumnGenPanel
 	//-------------------------------------------
 	private void createControls(Composite composite, int columns) {
 		mGeneratedCheckbox = new Button(composite, SWT.CHECK);
-		mGeneratedCheckbox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_genProp);
+		mGeneratedCheckbox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_GEN_PROP);
 		mGeneratedCheckbox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 			public void widgetSelected(SelectionEvent e) {
@@ -244,7 +244,7 @@ public class ColumnGenPanel
 		SWTUtil.fillColumns(mGeneratedCheckbox, columns);
 		
 		columnMappingGroup = new Group( composite, SWT.NONE);
-		columnMappingGroup.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_colMapping);
+		columnMappingGroup.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_MAPPING);
 		columnMappingGroup.setLayout(new GridLayout(columns, false));
 		GridData layoutData = new GridData();
 		layoutData.horizontalSpan = columns;
@@ -255,7 +255,7 @@ public class ColumnGenPanel
 		layoutData.horizontalIndent = 20 ;
 		columnMappingGroup.setLayoutData(layoutData);
 		
-		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_propName );
+		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_NAME );
 		mPropNameField = new Text(columnMappingGroup, SWT.BORDER | SWT.SINGLE );
 		mPropNameField.addModifyListener(new ModifyListener(){
 			@SuppressWarnings("restriction")
@@ -275,7 +275,7 @@ public class ColumnGenPanel
 		});
 		SWTUtil.fillColumns(mPropNameField ,3);
 		
-		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_propType );
+		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_TYPE );
 		mPropTypeCombo = new Combo(columnMappingGroup, SWT.SINGLE | SWT.READ_ONLY);
 		mPropTypeCombo.setItems( this.customizer.getAllPropertyTypes());
 		mPropTypeCombo.addModifyListener( new ModifyListener(){
@@ -287,7 +287,7 @@ public class ColumnGenPanel
 		});
 		SWTUtil.fillColumns(mPropTypeCombo,3);
 		
-		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_mapKind );
+		SWTUtil.createLabel(columnMappingGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_MAP_KIND );
 		mMappingKindCombo = new Combo(columnMappingGroup, SWT.SINGLE | SWT.READ_ONLY);
 		mMappingKindCombo.setItems( this.customizer.getAllMappingKinds());
 		mMappingKindCombo.addSelectionListener(new SelectionListener() {
@@ -301,7 +301,7 @@ public class ColumnGenPanel
 		SWTUtil.fillColumns(mMappingKindCombo ,3);
 		
 		mUpdateableCheckBox = new Button(columnMappingGroup, SWT.CHECK);
-		mUpdateableCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_colUpdateable);
+		mUpdateableCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_UPDATEABLE);
 		mUpdateableCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 			public void widgetSelected(SelectionEvent e) {
@@ -312,7 +312,7 @@ public class ColumnGenPanel
 		SWTUtil.fillColumns(mUpdateableCheckBox ,4);
 		
 		mInsertableCheckBox = new Button(columnMappingGroup, SWT.CHECK);
-		mInsertableCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_colInsertable);
+		mInsertableCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_INSERTABLE);
 		mInsertableCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 			public void widgetSelected(SelectionEvent e) {
@@ -331,7 +331,7 @@ public class ColumnGenPanel
 	void createJavaBeanPropertyControls(Composite composite, int columns){
 		//Java class generation properties 
 		domainClassGroup = new Group(composite, SWT.NONE);
-		domainClassGroup.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_beanProp );
+		domainClassGroup.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_BEAN_PROP );
 		domainClassGroup.setLayout(new GridLayout(columns, false));
 		GridData layoutData = new GridData();
 		layoutData.horizontalSpan = columns;
@@ -342,7 +342,7 @@ public class ColumnGenPanel
 		layoutData.horizontalIndent = 20;
 		domainClassGroup.setLayoutData(layoutData);
 
-		SWTUtil.createLabel(domainClassGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_getterScope );
+		SWTUtil.createLabel(domainClassGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_GETTER_SCOPE );
 		mPropGetScopePanel = new ScopePanel(domainClassGroup, new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 
@@ -354,7 +354,7 @@ public class ColumnGenPanel
 				
 			}});
 		
-		SWTUtil.createLabel(domainClassGroup, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_colPanel_setterScope );
+		SWTUtil.createLabel(domainClassGroup, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_COL_PANEL_SETTER_SCOPE );
 		mPropSetScopePanel = new ScopePanel(domainClassGroup, new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
index 405fc7e627..42865003af 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DatabaseGroup.java
@@ -87,11 +87,11 @@ public class DatabaseGroup
 		this.resourceManager = resourceManager;
 
 		// connection combo-box
-		this.buildLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.connection);
+		this.buildLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.CONNECTION);
 		this.connectionComboBox = this.buildConnectionComboBox(parent, widthHint);
 
 		// add connection button
-		Button addConnectionButton = this.buildButton(parent, JptJpaUiWizardsEntityGenMessages.addConnectionLink, this.resourceManager.createImage(JptCommonUiImages.ADD_CONNECTION_BUTTON), this.buildAddConnectionLinkSelectionListener());
+		Button addConnectionButton = this.buildButton(parent, JptJpaUiWizardsEntityGenMessages.ADD_CONNECTION_LINK, this.resourceManager.createImage(JptCommonUiImages.ADD_CONNECTION_BUTTON), this.buildAddConnectionLinkSelectionListener());
 		addConnectionButton.setLayoutData(new GridData());
 
 		// A composite holds the reconnect button & text
@@ -107,11 +107,11 @@ public class DatabaseGroup
 		comp.setLayout(gridLayout);
 
 		// reconnection button
-		this.reconnectButton = this.buildButton(comp, JptJpaUiWizardsEntityGenMessages.connectLink, this.resourceManager.createImage(JptCommonUiImages.RECONNECT_BUTTON),  this.buildReconnectLinkSelectionListener());
-		this.buildLabel(comp, 1, JptJpaUiWizardsEntityGenMessages.schemaInfo);
+		this.reconnectButton = this.buildButton(comp, JptJpaUiWizardsEntityGenMessages.CONNECT_LINK, this.resourceManager.createImage(JptCommonUiImages.RECONNECT_BUTTON),  this.buildReconnectLinkSelectionListener());
+		this.buildLabel(comp, 1, JptJpaUiWizardsEntityGenMessages.SCHEMA_INFO);
 
 		// schema combo-box
-		this.buildLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.schema);
+		this.buildLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.SCHEMA);
 		this.schemaComboBox = this.buildSchemaComboBox(parent);
 		// filler
 		new Label(parent, SWT.NULL);
@@ -337,7 +337,7 @@ public class DatabaseGroup
 				public void run(final IProgressMonitor monitor) 
 			    	throws InvocationTargetException, InterruptedException
 			    {
-					monitor.beginTask(JptJpaUiWizardsEntityGenMessages.connectingToDatabase, 10);
+					monitor.beginTask(JptJpaUiWizardsEntityGenMessages.CONNECTING_TO_DATABASE, 10);
 					final SynchronizedBoolean finished = new SynchronizedBoolean(false);
 					Thread t = new Thread() {
 						@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
index d5adbfab46..cf629e88e0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
@@ -73,8 +73,8 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 	public DefaultTableGenerationWizardPage(JpaProject jpaProject) {
 		super(true, "DefaultTableGenerationWizardPage"); //$NON-NLS-1$
 		this.jpaProject = jpaProject;
-		setTitle(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_title);
-		setDescription( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_desc);
+		setTitle(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TITLE);
+		setDescription( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DESC);
 	}
 	
 	
@@ -198,7 +198,7 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 
 	protected void createDomainJavaClassesPropertiesGroup(Composite composite, int columns) {
 		Group parent = new Group( composite, SWT.NONE);
-		parent.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_domainJavaClass);
+		parent.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DOMAIN_JAVA_CLASS);
 		parent.setLayout(new GridLayout( columns, false));
 		GridData layoutData = new GridData();
 		layoutData.horizontalSpan = columns;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
index 5909818c67..8d63afc57b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
@@ -90,7 +90,7 @@ public class GenerateEntitiesFromSchemaWizard
 	
 	public GenerateEntitiesFromSchemaWizard() {
 		this.resourceManager = this.buildResourceManager();
-		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_generateEntities);
+		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_GENERATE_ENTITIES);
 	}
 	
 	public GenerateEntitiesFromSchemaWizard( JpaProject jpaProject, IStructuredSelection selection) {
@@ -98,7 +98,7 @@ public class GenerateEntitiesFromSchemaWizard
 		this.jpaProject = jpaProject;
 		this.selection = selection;
 		this.resourceManager = this.buildResourceManager();
-		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_generateEntities);
+		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_GENERATE_ENTITIES);
 		this.setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER);
 	}
 
@@ -531,7 +531,7 @@ public class GenerateEntitiesFromSchemaWizard
 		}
 		
 		this.selection = selection;
-		this.setWindowTitle(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_generateEntities);
+		this.setWindowTitle(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_GENERATE_ENTITIES);
 	}
 
 	protected JpaProject getJpaProjectFromSelection(IStructuredSelection selection) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/JoinColumnsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/JoinColumnsPage.java
index 66a3542d2e..fcdc0135c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/JoinColumnsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/JoinColumnsPage.java
@@ -79,8 +79,8 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 
 	protected JoinColumnsPage(ORMGenCustomizer customizer ) {
 		super(customizer, "JoinColumnsPage");
-		setTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_title);
-		setDescription(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_desc);
+		setTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_TITLE);
+		setDescription(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_DESC);
 	}
 
 	public void createControl(Composite parent) {
@@ -153,7 +153,7 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 		tableDataModel1.clear();
 		joinColumnsTable1.refresh();
 		
-		String msg = String.format(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_label, table1Name, table2Name); 
+		String msg = String.format(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL, table1Name, table2Name); 
 		joinColumnsDescLabel1.setText(msg);
 		joinColumnsDescLabel1.setToolTipText( msg );
 		tablesGroup1.layout();
@@ -190,7 +190,7 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 		tableDataModel1.clear();
 		joinColumnsTable1.refresh();
 		
-		String msg = String.format(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_label, table1Name, joinTableName); 
+		String msg = String.format(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL, table1Name, joinTableName); 
 		joinColumnsDescLabel1.setText(msg);
 		joinColumnsDescLabel1.setToolTipText( msg );
 		String[] referrerColumnValues = getTableColumns(table1Name);
@@ -206,7 +206,7 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 
 		tableDataModel2.clear();
 		joinColumnsTable2.refresh();
-		msg = String.format(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_label, joinTableName, table2Name); 
+		msg = String.format(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL, joinTableName, table2Name); 
 		joinColumnsDescLabel2.setText(msg);
 		joinColumnsDescLabel2.setToolTipText( msg );
 		referrerColumnValues = getTableColumns(joinTableName);
@@ -234,7 +234,7 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 		buttonComposite.setLayoutData(data);
 		
 		Button addButton = new Button(buttonComposite, SWT.PUSH);
-		addButton.setText( JptJpaUiWizardsEntityGenMessages.add );
+		addButton.setText( JptJpaUiWizardsEntityGenMessages.ADD );
 		GridData gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		addButton.setLayoutData(gridData);
@@ -262,7 +262,7 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 		});
 		
 		Button removeButton = new Button(buttonComposite, SWT.PUSH);
-		removeButton.setText( JptJpaUiWizardsEntityGenMessages.remove );
+		removeButton.setText( JptJpaUiWizardsEntityGenMessages.REMOVE );
 		gridData =  new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		removeButton.setLayoutData(gridData);
@@ -356,13 +356,13 @@ public class JoinColumnsPage extends NewAssociationWizardPage {
 	}
 
 	private void createJoinColumnsTableControl1(Composite tablesGroup) {
-		joinColumnsDescLabel1 = createLabel(tablesGroup, 2, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_label );
+		joinColumnsDescLabel1 = createLabel(tablesGroup, 2, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL );
 		joinColumnsTable1 = createJoinColumnsTableControl(tablesGroup, this.tableDataModel1);
 		createAddRemoveButtonComposite(tablesGroup, joinColumnsTable1, tableDataModel1);
 	}
 	
 	private void createJoinColumnsTableControl2(Composite tablesGroup) {
-		joinColumnsDescLabel2 = createLabel(tablesGroup, 2, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_colsPage_label );
+		joinColumnsDescLabel2 = createLabel(tablesGroup, 2, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL );
 		joinColumnsTable2 = createJoinColumnsTableControl(tablesGroup, this.tableDataModel2);
 		createAddRemoveButtonComposite(tablesGroup, joinColumnsTable2, tableDataModel2);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/NewAssociationWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/NewAssociationWizard.java
index b3206c65fc..e6f4da9bf5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/NewAssociationWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/NewAssociationWizard.java
@@ -50,7 +50,7 @@ public class NewAssociationWizard extends Wizard {
 		this.jpaProject = jpaProject;
 		this.customizer = customizer;
 		this.resourceManager = resourceManager;
-		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_newAssoc_title);
+		this.setWindowTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TITLE);
 		
 		this.associationDataModel.put( NewAssociationWizard.ASSOCIATION_SCHEMA, this.customizer.getSchema());
 		this.associationDataModel.put( NewAssociationWizard.ASSOCIATION_JOIN_COLUMNS1, new TreeMap<String, String>());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
index f5a60218af..c355998a4b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/PromptJPAProjectWizardPage.java
@@ -46,8 +46,8 @@ public class PromptJPAProjectWizardPage extends WizardPage {
 	
 	public PromptJPAProjectWizardPage( final String helpContextId ) {
 		super(SELECT_PROJECT_PAGE_NAME);
-		setTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_selectJPAProject );
-		setMessage( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_selectJPAProject_msg );
+		setTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT );
+		setMessage( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT_MSG );
 		this.helpContextId = helpContextId;
 	}
 
@@ -58,7 +58,7 @@ public class PromptJPAProjectWizardPage extends WizardPage {
 		layout.numColumns = nColumns;
 		composite.setLayout(layout);			
 		Label label = new Label( composite, SWT.NONE );
-		label.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_selectJPAProject );
+		label.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT );
 		
 		this.projTableViewer = new TableViewer(composite, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.VIRTUAL);		
 		this.projTable = this.projTableViewer.getTable();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
index 6ae09f8a9b..07a9bb6184 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/SelectTableDialog.java
@@ -47,8 +47,8 @@ public class SelectTableDialog extends ElementListSelectionDialog {
 			public void removeListener(ILabelProviderListener listener) {}
 
 		});
-		this.setTitle( JptJpaUiWizardsEntityGenMessages.selectTableDlgTitle );//
-		this.setMessage( JptJpaUiWizardsEntityGenMessages.selectTableDlgDesc);//
+		this.setTitle( JptJpaUiWizardsEntityGenMessages.SELECT_TABLE_DLG_TITLE );//
+		this.setMessage( JptJpaUiWizardsEntityGenMessages.SELECT_TABLE_DLG_DESC);//
 	}
 	
 	public SelectTableDialog(Shell shell, ResourceManager resourceManager, Schema schema){
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
index 444ffef0d8..41d0c5e008 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableAssociationsWizardPage.java
@@ -95,8 +95,8 @@ public class TableAssociationsWizardPage extends WizardPage {
 		super("Table Associations"); //$NON-NLS-1$
 		this.jpaProject = jpaProject;
 		this.resourceManager = resourceManager;
-		setTitle(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_title);
-		setMessage(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_desc);
+		setTitle(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_TITLE);
+		setMessage(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DESC);
 		
 	}
 
@@ -111,7 +111,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		WorkbenchTools.setHelp(composite, JpaHelpContextIds.GENERATE_ENTITIES_WIZARD_TABLE_ASSOCIATIONS);
 
 		Label label = new Label(composite, SWT.NONE);
-		label.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_label );
+		label.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_LABEL );
 		GridData gd = new GridData();
 		gd.horizontalSpan = 2;
 		label.setLayoutData( gd );
@@ -135,7 +135,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		c.setLayout( new GridLayout(1,true) );
 		
 		createAssociationLink = new Button(c, SWT.NONE);
-		createAssociationLink.setToolTipText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_newAssoc );
+		createAssociationLink.setToolTipText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_NEW_ASSOC );
 		createAssociationLink.setImage(this.resourceManager.createImage(JptCommonUiImages.ADD_BUTTON));
 		createAssociationLink.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}	
@@ -150,7 +150,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		deleteAssociationLink.setForeground(foreground);
 		foreground.dispose();
 		deleteAssociationLink.setImage(this.resourceManager.createImage(JptCommonUiImages.DELETE_BUTTON));
-		deleteAssociationLink.setToolTipText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_delAssoc );
+		deleteAssociationLink.setToolTipText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DEL_ASSOC );
 		deleteAssociationLink.addSelectionListener(new SelectionListener(){
 			public void widgetDefaultSelected(SelectionEvent e) {}	
 			public void widgetSelected(SelectionEvent e) {
@@ -175,7 +175,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 
 	private void createGenerateAssociationCheckbox(Composite composite,  int columns) {
 		generateAssociationCheckBox = new Button(composite, SWT.CHECK);
-		generateAssociationCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_genAssoc);
+		generateAssociationCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_GEN_ASSOC);
 		generateAssociationCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		
@@ -198,7 +198,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 	@SuppressWarnings("restriction")
 	private void createGenerateReferrerRoleControls(Composite parent,  int columns) {
 		referrerRoleCheckBox = new Button(parent, SWT.CHECK);
-		referrerRoleCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_entityRef );
+		referrerRoleCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_ENTITY_REF );
 		referrerRoleCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		
@@ -232,7 +232,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		SWTUtil.fillColumnsWithIndent(referrerRoleCheckBox , columns-1, 20 );
 		newLabel(parent, "");//$NON-NLS-1$
 		
-		referrerRolePropertyLabel = newLabelWithIndent( parent,  JptJpaUiWizardsEntityGenMessages.property, 40 );
+		referrerRolePropertyLabel = newLabelWithIndent( parent,  JptJpaUiWizardsEntityGenMessages.PROPERTY, 40 );
 		referrerRolePropertyField = new Text( parent, SWT.BORDER);
 		fillColumns(referrerRolePropertyField, 2);
 		referrerRolePropertyField.addModifyListener(new ModifyListener(){
@@ -260,7 +260,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 				}
 			}	
 		}) ;
-		referrerRoleCascadeField.setLabelText( JptJpaUiWizardsEntityGenMessages.cascade );
+		referrerRoleCascadeField.setLabelText( JptJpaUiWizardsEntityGenMessages.CASCADE );
 		referrerRoleCascadeField.setButtonLabel(""); //$NON-NLS-1$
 		referrerRoleCascadeField.doFillIntoGrid(parent, 3);
 		referrerRoleCascadeField.getTextControl(parent).setEditable(false);
@@ -312,14 +312,14 @@ public class TableAssociationsWizardPage extends WizardPage {
 		
 		StatusUtil.applyToStatusLine(this, status);
 		if( status.getCode() == IStatus.OK ){
-			setMessage(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocPage_desc);
+			setMessage(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DESC);
 		}
 	}
 	
 	@SuppressWarnings("restriction")
 	private void createGenerateReferencedRoleControls(Composite parent,  int columns) {
 		referencedRoleCheckBox = new Button(parent, SWT.CHECK);
-		referencedRoleCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_setRef );
+		referencedRoleCheckBox.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_SET_REF );
 		referencedRoleCheckBox.addSelectionListener(new SelectionListener() {
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		
@@ -347,7 +347,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		SWTUtil.fillColumnsWithIndent( referencedRoleCheckBox , columns-1, 20 );
 		newLabel(parent, "");//$NON-NLS-1$
 		
-		referencedRolePropertyLabel = SWTUtil.newLabelWithIndent(parent,  JptJpaUiWizardsEntityGenMessages.property, 40 );
+		referencedRolePropertyLabel = SWTUtil.newLabelWithIndent(parent,  JptJpaUiWizardsEntityGenMessages.PROPERTY, 40 );
 		
 		referencedRolePropertyField = new Text( parent, SWT.BORDER);
 		fillColumns(referencedRolePropertyField, 2);
@@ -380,7 +380,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 				}
 			}	
 		}) ;
-		referencedRoleCascadeField.setLabelText( JptJpaUiWizardsEntityGenMessages.cascade );
+		referencedRoleCascadeField.setLabelText( JptJpaUiWizardsEntityGenMessages.CASCADE );
 		referencedRoleCascadeField.setButtonLabel(""); //$NON-NLS-1$
 		referencedRoleCascadeField.doFillIntoGrid(parent, 3);
 		referencedRoleCascadeField.getTextControl(parent).setEditable( false);
@@ -434,7 +434,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 
 		//Cardinality
 		cardinalityLabel = new Label(parent, SWT.NONE);
-		cardinalityLabel.setText( JptJpaUiWizardsEntityGenMessages.cardinality);
+		cardinalityLabel.setText( JptJpaUiWizardsEntityGenMessages.CARDINALITY);
 		GridData gd = new GridData();
 		gd.horizontalIndent = 20;
 		cardinalityLabel.setLayoutData( gd );
@@ -461,11 +461,11 @@ public class TableAssociationsWizardPage extends WizardPage {
 		label.setLayoutData(layoutData);
 		
 		//Table join condition
-		joinConditionLabel = newLabelWithIndent(parent, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_tableJoin, 20 );
+		joinConditionLabel = newLabelWithIndent(parent, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_TABLE_JOIN, 20 );
 		
 		joinConditionText = new Text( parent, SWT.MULTI | SWT.BORDER );
 		joinConditionText.setEditable(false);
-		joinConditionText.setText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_joinedWhen);
+		joinConditionText.setText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_JOINED_WHEN);
 		layoutData = new GridData();
 		layoutData.horizontalSpan = 2;
 		layoutData.verticalAlignment = SWT.TOP;
@@ -618,17 +618,17 @@ public class TableAssociationsWizardPage extends WizardPage {
 		String text = null;
 		//if MTM
 		if( Association.MANY_TO_MANY.equals( cardinality ) ){
-			text = String.format( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_setRef, table2Name, table1Name);
+			text = String.format( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_SET_REF, table2Name, table1Name);
 		}else{
-			text = String.format( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_entityRef, table2Name, table1Name);
+			text = String.format( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_ENTITY_REF, table2Name, table1Name);
 		}
 		this.referrerRoleCheckBox.setText(text);
 
 		//if OTO
 		if( Association.ONE_TO_ONE.equals( cardinality ) ){
-			text = String.format( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_entityRef, table1Name, table2Name);
+			text = String.format( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_ENTITY_REF, table1Name, table2Name);
 		}else{
-			text = String.format( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_assocEditor_setRef, table1Name, table2Name);
+			text = String.format( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_SET_REF, table1Name, table2Name);
 		}
 		this.referencedRoleCheckBox.setText(text);
 
@@ -682,7 +682,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 		String text = "%s";
 		if( joinTableName == null ){
 			StringBuilder strText = new StringBuilder();
-			//text = JptUiEntityGenMessages.GenerateEntitiesWizard_assocEditor_joinedWhen;
+			//text = JptUiEntityGenMessages.GENERATE_ENTITIES_WIZARD_assocEditor_joinedWhen;
 			List<String> columnList1 = association.getReferrerColumnNames() ;
 			List<String> columnList2 = association.getReferencedColumnNames();
 			for( int i=0; i < columnList1.size(); i++){
@@ -695,7 +695,7 @@ public class TableAssociationsWizardPage extends WizardPage {
 			joinConditionText.setText( String.format( text , strText.toString()) ); 
 		}else{
 			StringBuilder strText = new StringBuilder();
-			//text = JptUiEntityGenMessages.GenerateEntitiesWizard_assocEditor_joinedWhen;
+			//text = JptUiEntityGenMessages.GENERATE_ENTITIES_WIZARD_assocEditor_joinedWhen;
 			List<String> columnList1 = association.getReferrerColumnNames() ;
 			List<String> joinColumnList1 = association.getReferrerJoinColumnNames()  ;
 			for( int i=0; i < columnList1.size(); i++){
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableGenPanel.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableGenPanel.java
index ed86e5fac2..9bbe57c05c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableGenPanel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TableGenPanel.java
@@ -76,7 +76,7 @@ public class TableGenPanel
 	
 	protected void createTableMappingPropertiesGroup(Composite composite, int columns) {
 		Group parent = new Group(composite, SWT.NONE );
-		parent.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_tableMapping);
+		parent.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TABLE_MAPPING);
 		parent.setLayout(new GridLayout(columns, false));
 		GridData layoutData = new GridData();
 		layoutData.horizontalSpan = columns;
@@ -101,8 +101,8 @@ public class TableGenPanel
 	
 	private void createGenerateOptionalAnnotationControls(Group parent, int columns) {
 		generateOptionalAnnotations = new Button(parent, SWT.CHECK );
-		generateOptionalAnnotations.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations);
-		generateOptionalAnnotations.setToolTipText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations_desc);
+		generateOptionalAnnotations.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS);
+		generateOptionalAnnotations.setToolTipText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS_DESC);
 
 		GridData gd = new GridData();
 		gd.horizontalSpan = columns;
@@ -119,7 +119,7 @@ public class TableGenPanel
 	protected void createClassNameControl(Composite parent, int columns) {
 		//Customize class name for specific table only
 		if ( !isDefaultTable ) {
-			SWTUtil.createLabel( parent, 1 , JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tablePanel_className );
+			SWTUtil.createLabel( parent, 1 , JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_PANEL_CLASS_NAME );
 			
 			classNameField = new Text(parent, SWT.SINGLE | SWT.BORDER );
 			//mPackageNameField.setEditable(false);
@@ -153,13 +153,13 @@ public class TableGenPanel
 	}
 
 	protected void createAssociationFetchControls(Composite composite, int columns) {
-		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_fetch );
+		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH );
 		
 		Composite parent = new Composite( composite, SWT.NONE);
 		parent.setLayout(new RowLayout());
 		SWTUtil.fillColumns( parent , 3);
 		associationFetchDefault	= new Button( parent, SWT.RADIO );
-		associationFetchDefault.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_fetchDefault);
+		associationFetchDefault.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH_DEFAULT);
 		associationFetchDefault.setData( ORMGenTable.DEFAULT_FETCH );	
 		
 		associationFetchEager = new Button( parent, SWT.RADIO );
@@ -187,7 +187,7 @@ public class TableGenPanel
 	}	
 	
 	protected void createCollectionTypeControls(Composite composite, int columns) {
-		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_collType );
+		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_COLLECTION_TYPE );
 		
 		Composite parent = new Composite( composite, SWT.NONE);
 		parent.setLayout(new RowLayout());
@@ -309,7 +309,7 @@ public class TableGenPanel
 	}
 
 	protected void createIdGeneratorControls(Composite parent, int columns) {
-		SWTUtil.createLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_keyGen );
+		SWTUtil.createLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_KEY_GEN );
 
 		idGeneratorCombo = new Combo(parent,SWT.SINGLE | SWT.READ_ONLY);
 		SWTUtil.fillColumns(idGeneratorCombo, 3);
@@ -325,7 +325,7 @@ public class TableGenPanel
 				idGenChanged();
 			}});
 
-		SWTUtil.createLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_sequence );
+		SWTUtil.createLabel(parent, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE );
 		sequenceNameField = new Text( parent, SWT.SINGLE | SWT.BORDER );
 		
 		SWTUtil.fillColumns(sequenceNameField, 3);
@@ -362,7 +362,7 @@ public class TableGenPanel
 		
 		SWTUtil.newLabel(parent, "");//$NON-NLS-1$
 		sequenceNameNoteLabel = new Label(parent, SWT.NONE);
-		String text =String.format( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_sequenceNote, 
+		String text =String.format( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE_NOTE, 
 				ORMGenTable.TABLE_SEQ_PATTERN, ORMGenTable.PK_SEQ_PATTERN);
 		sequenceNameNoteLabel.setText( text ) ;
 		sequenceNameNoteLabel.setEnabled(false);
@@ -407,7 +407,7 @@ public class TableGenPanel
 	}
 	
 	private void createEntityAccessControls(Composite composite, int columns) {
-		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_access );
+		SWTUtil.createLabel(composite, 1, JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_ACCESS );
 		
 		Composite parent = new Composite( composite, SWT.NONE);
 		SWTUtil.fillColumns( parent , 3);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
index 11055f7ee2..5b6d791d69 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java
@@ -69,8 +69,8 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 		super(true, "TablesAndColumnsCustomizationWizardPage"); //$NON-NLS-1$
 		this.jpaProject = jpaProject;
 		this.resourceManager = resourceManager;
-		setTitle( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tablesAndColumnsPage_title );
-		setMessage( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tablesAndColumnsPage_desc);
+		setTitle( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_TITLE );
+		setMessage( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_DESC);
 	}
 
 	// -------- Initialization ---------
@@ -118,7 +118,7 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 	 */
 	private void createTableAndColumnsListPanel(Composite parent, int columns) {
 		Label label = new Label(parent, columns );
-		label.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tablesAndColumnsPage_labelTableAndColumns );
+		label.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_LABEL_TABLE_AND_COLUMNS );
 		SWTUtil.fillColumns( label , columns);
 		
 		GridData data = new GridData();
@@ -215,7 +215,7 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage {
 	
 	protected void createDomainJavaClassesPropertiesGroup(Composite composite, int columns) {
 		Group parent = new Group( composite, SWT.NONE);
-		parent.setText( JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_domainJavaClass );
+		parent.setText( JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DOMAIN_JAVA_CLASS );
 		parent.setLayout(new GridLayout(columns, false));
 		SWTUtil.fillColumns( parent, columns);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
index 6f7bd3ac87..fb83e8342a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/TablesSelectorWizardPage.java
@@ -109,8 +109,8 @@ public class TablesSelectorWizardPage extends WizardPage {
 		this.resourceManager = resourceManager;
 		this.schema = jpaProject.getDefaultDbSchema();
 		this.isDynamic = isDynamic;
-		this.setTitle(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_selectTable );
-		this.setMessage(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_chooseEntityTable );
+		this.setTitle(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_SELECT_TABLE );
+		this.setMessage(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_CHOOSE_ENTITY_TABLE );
 	}
 
 	// ********** IDialogPage implementation  **********
@@ -197,7 +197,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 		
 		Label tableLabel = new Label(parent, SWT.NONE);
 		tableLabel.setLayoutData(gridData);
-		tableLabel.setText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_tables );
+		tableLabel.setText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLES );
 		
 		this.searchText = this.buildSearchText(parent);
 
@@ -343,7 +343,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 		org.eclipse.swt.widgets.Table table = new org.eclipse.swt.widgets.Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER | SWT.CHECK);
 
 		TableColumn tableNameColumn = new TableColumn(table, SWT.NONE, TABLE_COLUMN_INDEX);
-		tableNameColumn.setText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_tableColumn);
+		tableNameColumn.setText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_COLUMN);
 		tableNameColumn.setResizable(true);
 
 		table.addKeyListener(this.buildTableKeyListener());
@@ -386,7 +386,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	
 	private Button buildUpdatePersistenceXmlCheckBox(Composite parent) {
 		Button checkBox = new Button(parent, SWT.CHECK);
-		checkBox.setText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_updatePersistenceXml );
+		checkBox.setText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_UPDATE_PERSISTENCE_XML );
 		checkBox.setSelection(this.updatePersistenceXml());
 		checkBox.addSelectionListener(this.buildUpdatePersistenceXmlSelectionListener());
 		
@@ -398,7 +398,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 		GridData gridData = new GridData();
 		gridData.horizontalAlignment = SWT.END;
 		button.setLayoutData(gridData);
-		button.setText(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_Restore_Defaults);
+		button.setText(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_RESTORE_DEFAULTS);
 		button.addSelectionListener(this.buildRestoreDefaultsSelectionListener());
 		
 		return button;
@@ -472,7 +472,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	private Text buildSearchText(Composite parent) {
 		GridData gridData = new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
 		Text text = new Text(parent, SWT.BORDER | SWT.SEARCH | SWT.ICON_SEARCH | SWT.ICON_CANCEL);
-		text.setMessage(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_tableSearch);
+		text.setMessage(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_SEARCH);
 		text.setLayoutData(gridData);
 		text.addSelectionListener(this.buildClearSearchTextSelectionListener());
 		text.addKeyListener(this.buildSearchTextKeyListener());
@@ -622,7 +622,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 	private WorkspaceJob buildFetchTablesJob(final Schema schema) {
 		final Collection<Table> tables = new ArrayList<Table>();
 
-		WorkspaceJob workspaceJob = new WorkspaceJob(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_getTables_jobName) {
+		WorkspaceJob workspaceJob = new WorkspaceJob(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_JOB_NAME) {
 
 			@Override
 			public IStatus runInWorkspace(IProgressMonitor monitor) {
@@ -630,12 +630,12 @@ public class TablesSelectorWizardPage extends WizardPage {
 					return Status.CANCEL_STATUS;
 				}
 				SubMonitor subMonitor = SubMonitor.convert(monitor, 
-					JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_getTables_taskName, 75);
+					JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_TASK_NAME, 75);
 				try {
 					subMonitor.beginTask(schema.getContainer().getName(), 100);
 					subMonitor.subTask(
 						NLS.bind(
-							JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_getTables_subTaskName, 
+							JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_SUB_TASK_NAME, 
 							schema.getName()));
 					subMonitor.worked(20);
 
@@ -685,7 +685,7 @@ public class TablesSelectorWizardPage extends WizardPage {
 					public void run( final IProgressMonitor monitor ) 
 				    	throws InvocationTargetException, InterruptedException
 				    {
-						monitor.beginTask(JptJpaUiWizardsEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_statusUpdate_taskName, 10);
+						monitor.beginTask(JptJpaUiWizardsEntityGenMessages.GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_STATUS_UPDATE_TASK_NAME, 10);
 				
 						Collection<Table> ret = TablesSelectorWizardPage.this.getSelectedTables();
 						ArrayList<String> tableNames = new ArrayList<String>();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/wizards/gen/JptJpaUiWizardsEntityGenMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/wizards/gen/JptJpaUiWizardsEntityGenMessages.java
index 09cd3cc0c6..8f49a70481 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/wizards/gen/JptJpaUiWizardsEntityGenMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/wizards/gen/JptJpaUiWizardsEntityGenMessages.java
@@ -21,106 +21,106 @@ public class JptJpaUiWizardsEntityGenMessages {
 		NLS.initializeMessages(BUNDLE_NAME, BUNDLE_CLASS);
 	}
 
-	public static String GenerateEntitiesWizard_tableSelectPage_Restore_Defaults;
-	public static String GenerateEntitiesWizard_generateEntities;
-	public static String GenerateEntitiesWizard_selectJPAProject;
-	public static String GenerateEntitiesWizard_selectJPAProject_msg;
-	public static String GenerateEntitiesWizard_tableSelectPage_selectTable;
-	public static String GenerateEntitiesWizard_tableSelectPage_chooseEntityTable;
-	public static String GenerateEntitiesWizard_tableSelectPage_updatePersistenceXml;
-	public static String GenerateEntitiesWizard_tableSelectPage_tables;
-	public static String GenerateEntitiesWizard_tableSelectPage_tableColumn;
-	public static String GenerateEntitiesWizard_tableSelectPage_tableSearch;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_RESTORE_DEFAULTS;
+	public static String GENERATE_ENTITIES_WIZARD_GENERATE_ENTITIES;
+	public static String GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT;
+	public static String GENERATE_ENTITIES_WIZARD_SELECT_JPA_PROJECT_MSG;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_SELECT_TABLE;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_CHOOSE_ENTITY_TABLE;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_UPDATE_PERSISTENCE_XML;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLES;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_COLUMN;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_TABLE_SEARCH;
 	
-	public static String GenerateEntitiesWizard_tableSelectPage_getTables_jobName;
-	public static String GenerateEntitiesWizard_tableSelectPage_getTables_taskName;
-	public static String GenerateEntitiesWizard_tableSelectPage_getTables_subTaskName;
-	public static String GenerateEntitiesWizard_tableSelectPage_statusUpdate_taskName;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_JOB_NAME;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_TASK_NAME;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_GET_TABLES_SUB_TASK_NAME;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_SELECT_PAGE_STATUS_UPDATE_TASK_NAME;
 
 	//Database connection group
-	public static String connection;
-	public static String addConnectionLink;
-	public static String connectLink;
-	public static String schemaInfo;
-	public static String schema;
-	public static String connectingToDatabase;
+	public static String CONNECTION;
+	public static String ADD_CONNECTION_LINK;
+	public static String CONNECT_LINK;
+	public static String SCHEMA_INFO;
+	public static String SCHEMA;
+	public static String CONNECTING_TO_DATABASE;
 	
 	//Default table gen properties
-	public static String GenerateEntitiesWizard_defaultTablePage_title;
-	public static String GenerateEntitiesWizard_defaultTablePage_desc;
-	public static String GenerateEntitiesWizard_defaultTablePage_domainJavaClass;
-	public static String GenerateEntitiesWizard_defaultTablePage_tableMapping;
-	public static String GenerateEntitiesWizard_tablePanel_className;
-	public static String GenerateEntitiesWizard_defaultTablePage_fetch;
-	public static String GenerateEntitiesWizard_defaultTablePage_fetchDefault;
-	public static String GenerateEntitiesWizard_defaultTablePage_collType;
-	public static String GenerateEntitiesWizard_defaultTablePage_sequence;
-	public static String GenerateEntitiesWizard_defaultTablePage_sequenceNote;
-	public static String GenerateEntitiesWizard_defaultTablePage_access;
-	public static String GenerateEntitiesWizard_defaultTablePage_keyGen;
-	public static String GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations;
-	public static String GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations_desc;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DESC;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_DOMAIN_JAVA_CLASS;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_TABLE_MAPPING;
+	public static String GENERATE_ENTITIES_WIZARD_TABLE_PANEL_CLASS_NAME;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_FETCH_DEFAULT;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_COLLECTION_TYPE;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_SEQUENCE_NOTE;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_ACCESS;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_KEY_GEN;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS;
+	public static String GENERATE_ENTITIES_WIZARD_DEFAULT_TABLE_PAGE_GEN_OPTIONAL_ANNOTATIONS_DESC;
 	
 	//Asso figure
-	public static String manyToOneDesc;
-	public static String oneToOneDesc;
-	public static String manyToManyDesc;
+	public static String MANY_TO_ONE_DESC;
+	public static String ONE_TO_ONE_DESC;
+	public static String MANY_TO_MANY_DESC;
 	//table association wizard page
-	public static String GenerateEntitiesWizard_assocPage_title;
-	public static String GenerateEntitiesWizard_assocPage_desc;
-	public static String GenerateEntitiesWizard_assocPage_label;
-	public static String GenerateEntitiesWizard_assocPage_newAssoc;
-	public static String GenerateEntitiesWizard_assocPage_delAssoc;
-	public static String GenerateEntitiesWizard_assocEditor_genAssoc;
-	public static String GenerateEntitiesWizard_assocEditor_entityRef;
-	public static String property;
-	public static String cascade;
-	public static String GenerateEntitiesWizard_assocEditor_setRef;
-	public static String GenerateEntitiesWizard_assocEditor_joinedWhen;
-	public static String GenerateEntitiesWizard_assocEditor_tableJoin;
-	public static String cardinality;
-	public static String selectCascadeDlgTitle;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DESC;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_LABEL;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_NEW_ASSOC;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_PAGE_DEL_ASSOC;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_GEN_ASSOC;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_ENTITY_REF;
+	public static String PROPERTY;
+	public static String CASCADE;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_SET_REF;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_JOINED_WHEN;
+	public static String GENERATE_ENTITIES_WIZARD_ASSOC_EDITOR_TABLE_JOIN;
+	public static String CARDINALITY;
+	public static String SELECT_CASCADE_DLG_TITLE;
 	//new association wizard
-	public static String GenerateEntitiesWizard_newAssoc_title;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_title;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_desc;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_assocKind;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_simpleAssoc;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_m2mAssoc;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_assocTables;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_table1;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_table2;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_intermediateTable;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_table;
-	public static String GenerateEntitiesWizard_newAssoc_tablesPage_nonexsistent_join_table;
-	public static String GenerateEntitiesWizard_newAssoc_colsPage_title;
-	public static String GenerateEntitiesWizard_newAssoc_colsPage_desc;
-	public static String GenerateEntitiesWizard_newAssoc_colsPage_label;
-	public static String add;
-	public static String remove;
-	public static String GenerateEntitiesWizard_newAssoc_cardinalityPage_title;
-	public static String GenerateEntitiesWizard_newAssoc_cardinalityPage_desc;
-	public static String manyToOne;
-	public static String oneToMany;
-	public static String oneToOne;
-	public static String manyToMany;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_DESC;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_KIND;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_SIMPLE_ASSOC;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_M2M_ASSOC;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_ASSOC_TABLES;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE1;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_TABLE2;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_INTERMEDIATE_TABLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_TABLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_TABLES_PAGE_NONEXSISTENT_JOIN_TABLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_DESC;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_COLS_PAGE_LABEL;
+	public static String ADD;
+	public static String REMOVE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_NEW_ASSOC_CARDINALITY_PAGE_DESC;
+	public static String MANY_TO_ONE;
+	public static String ONE_TO_MANY;
+	public static String ONE_TO_ONE;
+	public static String MANY_TO_MANY;
 	//select table dialog
-	public static String selectTableDlgTitle;
-	public static String selectTableDlgDesc;
+	public static String SELECT_TABLE_DLG_TITLE;
+	public static String SELECT_TABLE_DLG_DESC;
 	//individual table and column gen properties
-	public static String GenerateEntitiesWizard_tablesAndColumnsPage_title;
-	public static String GenerateEntitiesWizard_tablesAndColumnsPage_desc;
-	public static String GenerateEntitiesWizard_tablesAndColumnsPage_labelTableAndColumns;
-	public static String GenerateEntitiesWizard_colPanel_genProp;
-	public static String GenerateEntitiesWizard_colPanel_colMapping;
-	public static String GenerateEntitiesWizard_colPanel_propName;
-	public static String GenerateEntitiesWizard_colPanel_propType;
-	public static String GenerateEntitiesWizard_colPanel_mapKind;
-	public static String GenerateEntitiesWizard_colPanel_colUpdateable;
-	public static String GenerateEntitiesWizard_colPanel_colInsertable;
-	public static String GenerateEntitiesWizard_colPanel_beanProp;
-	public static String GenerateEntitiesWizard_colPanel_getterScope;
-	public static String GenerateEntitiesWizard_colPanel_setterScope;
+	public static String GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_TITLE;
+	public static String GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_DESC;
+	public static String GENERATE_ENTITIES_WIZARD_TABLES_AND_COLUMNS_PAGE_LABEL_TABLE_AND_COLUMNS;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_GEN_PROP;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_MAPPING;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_NAME;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_PROP_TYPE;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_MAP_KIND;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_UPDATEABLE;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_COL_INSERTABLE;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_BEAN_PROP;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_GETTER_SCOPE;
+	public static String GENERATE_ENTITIES_WIZARD_COL_PANEL_SETTER_SCOPE;
 
 	private JptJpaUiWizardsEntityGenMessages() {
 		throw new UnsupportedOperationException();