rename NewEditorResourceNLS.java to EditorMessages.java.

46 files changed, 282 insertions, 282 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/NewEditorResourcesNLS.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
index 9e970807d..ad7243e0b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/NewEditorResourcesNLS.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
@@ -2,16 +2,16 @@ package org.eclipse.jst.jsf.facesconfig.ui;
 
 import org.eclipse.osgi.util.NLS;
 
-public final class NewEditorResourcesNLS extends NLS {
+public final class EditorMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS";
+	private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.EditorMessages";
 
-	private NewEditorResourcesNLS() {
+	private EditorMessages() {
 		// Do not instantiate
 	}
 
 	static {
-		NLS.initializeMessages(BUNDLE_NAME, NewEditorResourcesNLS.class);
+		NLS.initializeMessages(BUNDLE_NAME, EditorMessages.class);
 	}
 
 	public static String UI_Button_Add;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/NewEditorResourcesNLS.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
index cbc3432c0..cbc3432c0 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/NewEditorResourcesNLS.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
index 039ee59bb..5ef1a01c7 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
@@ -368,7 +368,7 @@ public class FacesConfigEditor extends FormEditor implements
 
 			sourcePageId = addPage(sourcePage, this.getEditorInput());
 			setPageText(sourcePageId,
-					NewEditorResourcesNLS.FacesConfigEditor_Source_TabName);
+					EditorMessages.FacesConfigEditor_Source_TabName);
 			sourcePage.update();
 
 		} catch (PartInitException e) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
index 0c5c20cc2..f9c97b625 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
@@ -215,7 +215,7 @@ public class MultiPageEditorOutlinePage extends Page implements
 	 */
 	protected IPage createDefaultPage(PageBook book) {
 		// Message to show on the default page
-		String defaultText = NewEditorResourcesNLS.MultiPageEditorOutlinePage_noOutline;
+		String defaultText = EditorMessages.MultiPageEditorOutlinePage_noOutline;
 
 		MessagePage page = new MessagePage();
 		initPage(page);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
index 37f43f297..761fc68b7 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -86,10 +86,10 @@ public class AddEditAttributeDialog extends Dialog {
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		if (isNew)
-			newShell.setText(NewEditorResourcesNLS.AttributeSection_Dialog_Title_Add);
+			newShell.setText(EditorMessages.AttributeSection_Dialog_Title_Add);
 		else
 			newShell
-					.setText(NewEditorResourcesNLS.AttributeSection_Dialog_Title_Edit);
+					.setText(EditorMessages.AttributeSection_Dialog_Title_Edit);
 	}
 
 	/*
@@ -108,7 +108,7 @@ public class AddEditAttributeDialog extends Dialog {
 		tabFolder.setLayoutData(gd);
 		TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
 		generalTabItem
-				.setText(NewEditorResourcesNLS.AttributeSection_Dialog_Tab_General);
+				.setText(EditorMessages.AttributeSection_Dialog_Tab_General);
 		Control control = createGeneralTabControl(generalTabItem.getParent());
 		generalTabItem.setControl(control);
 		return container;
@@ -130,22 +130,22 @@ public class AddEditAttributeDialog extends Dialog {
 		attributeNameField = new StringDialogField();
 //		attributeNameField.setRequired(true);
 		attributeNameField
-				.setLabelText(NewEditorResourcesNLS.AttributeSection_Dialog_AttributeName);
+				.setLabelText(EditorMessages.AttributeSection_Dialog_AttributeName);
 
 		attributeClassField = new ClassButtonDialogField(getProject());
 //		attributeClassField.setRequired(true);
 		attributeClassField
-				.setLabelText(NewEditorResourcesNLS.AttributeSection_Dialog_AttributeClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.AttributeSection_Dialog_AttributeClass);//$NON-NLS-1$
 
 		attributeClassField.setAutoOpenResource(false);
 
 		defaultValueField = new StringDialogField();
 		defaultValueField
-				.setLabelText(NewEditorResourcesNLS.AttributeSection_Dialog_DefaultValue);
+				.setLabelText(EditorMessages.AttributeSection_Dialog_DefaultValue);
 
 		suggestedValueField = new StringDialogField();
 		suggestedValueField
-				.setLabelText(NewEditorResourcesNLS.AttributeSection_Dialog_SuggestedValue);
+				.setLabelText(EditorMessages.AttributeSection_Dialog_SuggestedValue);
 
 		GridData data = new GridData(GridData.FILL_BOTH);
 		composite.setLayoutData(data);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
index f743d7a85..41e5f37b3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
@@ -14,7 +14,7 @@ package org.eclipse.jst.jsf.facesconfig.ui.dialog;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -89,9 +89,9 @@ public class AddEditFacetDialog extends Dialog {
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		if (isNew)
-			newShell.setText(NewEditorResourcesNLS.FacetSection_Dialog_Title_Add);
+			newShell.setText(EditorMessages.FacetSection_Dialog_Title_Add);
 		else
-			newShell.setText(NewEditorResourcesNLS.FacetSection_Dialog_Title_Edit);
+			newShell.setText(EditorMessages.FacetSection_Dialog_Title_Edit);
 	}
 
 	/*
@@ -109,7 +109,7 @@ public class AddEditFacetDialog extends Dialog {
 		TabFolder tabFolder = new TabFolder(container, SWT.FILL);
 		tabFolder.setLayoutData(gd);
 		TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
-		generalTabItem.setText(NewEditorResourcesNLS.FacetSection_Dialog_Tab_General);
+		generalTabItem.setText(EditorMessages.FacetSection_Dialog_Tab_General);
 		Control control = createGeneralTabControl(generalTabItem.getParent());
 		generalTabItem.setControl(control);
 		return container;
@@ -131,15 +131,15 @@ public class AddEditFacetDialog extends Dialog {
 		facetNameField = new StringDialogField();
 //		facetNameField.setRequired(true);
 		facetNameField
-				.setLabelText(NewEditorResourcesNLS.FacetSection_Dialog_FacetName);
+				.setLabelText(EditorMessages.FacetSection_Dialog_FacetName);
 
 		displayNameField = new StringDialogField();
 		displayNameField
-				.setLabelText(NewEditorResourcesNLS.FacetSection_Dialog_DisplayName);
+				.setLabelText(EditorMessages.FacetSection_Dialog_DisplayName);
 
 		descriptionField = new StringDialogField();
 		descriptionField
-				.setLabelText(NewEditorResourcesNLS.FacetSection_Dialog_Description);
+				.setLabelText(EditorMessages.FacetSection_Dialog_Description);
 
 		GridData data = new GridData(GridData.FILL_BOTH);
 		composite.setLayoutData(data);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
index 069018530..d02bc7344 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
@@ -33,7 +33,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
 import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
 import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanProperty;
 import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanUtils;
@@ -159,7 +159,7 @@ public class AddEditManagedPropertyDialog extends Dialog {
 
 		nameField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
 				| SWT.BORDER);
-		nameField.setLabelText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_PropertyName);
+		nameField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyName);
 
 		int propertyCount = 0;
 		beanPropertyList = getBeanPropertyList(managedBean);
@@ -185,11 +185,11 @@ public class AddEditManagedPropertyDialog extends Dialog {
 
 		classField = new ClassButtonDialogField(null);
 		classField.setProject(getProject());
-		classField.setLabelText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_PropertyClass);
+		classField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyClass);
 
 		valueTypeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
 				| SWT.BORDER);
-		valueTypeField.setLabelText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_ValueType);
+		valueTypeField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_ValueType);
 
 		valueTypeField.setItems(valueTypes);
 		valueTypeField
@@ -207,8 +207,8 @@ public class AddEditManagedPropertyDialog extends Dialog {
 
 		});
 
-		valueField.setLabelText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
-		valueField.setButtonLabel(NewEditorResourcesNLS.UI_Button_Edit_more);
+		valueField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
+		valueField.setButtonLabel(EditorMessages.UI_Button_Edit_more);
 
 		valueField.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
index 3695194ac..0545cc647 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
@@ -16,7 +16,7 @@ import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
 import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -80,9 +80,9 @@ public class AddEditMapEntryDialog extends Dialog {
 		super.configureShell(newShell);
 		if (isNew)
 			// TODO change it to "add"
-			newShell.setText(NewEditorResourcesNLS.MapEntryEditPage_Title);
+			newShell.setText(EditorMessages.MapEntryEditPage_Title);
 		else
-			newShell.setText(NewEditorResourcesNLS.MapEntryEditPage_Title);
+			newShell.setText(EditorMessages.MapEntryEditPage_Title);
 	}
 
 	/*
@@ -121,7 +121,7 @@ public class AddEditMapEntryDialog extends Dialog {
 
 	public void layoutKeySection(Composite parent) {
 		keyField = new StringDialogField();
-		keyField.setLabelText(NewEditorResourcesNLS.MapEntryEditGroup_Key); //$NON-NLS-1$
+		keyField.setLabelText(EditorMessages.MapEntryEditGroup_Key); //$NON-NLS-1$
 		Composite
 
 		keySection = SWTUtils.createComposite(parent, SWT.NONE);
@@ -167,7 +167,7 @@ public class AddEditMapEntryDialog extends Dialog {
 		});
 		valueField = new StringDialogField(VALUE_DEFAULT_LINENUMS);
 
-		valueField.setLabelText(NewEditorResourcesNLS.ValueEditGroup_Value); //$NON-NLS-1$
+		valueField.setLabelText(EditorMessages.ValueEditGroup_Value); //$NON-NLS-1$
 		valueField.doFillIntoGrid(null, valueSection, numberOfColumns);
 
 		gd = (GridData) valueField.getLabelControl(null, valueSection)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
index 3ab18adb3..f55c0ebd3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.ClassButtonDialogField;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.LayoutUtil;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
@@ -92,11 +92,11 @@ public class AddEditPropertyDialog extends Dialog {
 		super.configureShell(newShell);
 		if (isNew)
 			newShell
-					.setText(NewEditorResourcesNLS.PropertySection_Dialog_Title_Add);
+					.setText(EditorMessages.PropertySection_Dialog_Title_Add);
 		else
 
 			newShell
-					.setText(NewEditorResourcesNLS.PropertySection_Dialog_Title_Edit);
+					.setText(EditorMessages.PropertySection_Dialog_Title_Edit);
 	}
 
 	/*
@@ -115,7 +115,7 @@ public class AddEditPropertyDialog extends Dialog {
 		tabFolder.setLayoutData(gd);
 		TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
 		generalTabItem
-				.setText(NewEditorResourcesNLS.PropertySection_Dialog_Tab_General);
+				.setText(EditorMessages.PropertySection_Dialog_Tab_General);
 		Control control = createGeneralTabControl(generalTabItem.getParent());
 		generalTabItem.setControl(control);
 		return container;
@@ -137,22 +137,22 @@ public class AddEditPropertyDialog extends Dialog {
 		propertyNameField = new StringDialogField();
 		// propertyNameField.setRequired(true);
 		propertyNameField
-				.setLabelText(NewEditorResourcesNLS.PropertySection_Dialog_PropertyName);
+				.setLabelText(EditorMessages.PropertySection_Dialog_PropertyName);
 
 		propertyClassField = new ClassButtonDialogField(getProject());
 		// propertyClassField.setRequired(true);
 		propertyClassField
-				.setLabelText(NewEditorResourcesNLS.PropertySection_Dialog_PropertyClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.PropertySection_Dialog_PropertyClass);//$NON-NLS-1$
 
 		propertyClassField.setAutoOpenResource(false);
 
 		defaultValueField = new StringDialogField();
 		defaultValueField
-				.setLabelText(NewEditorResourcesNLS.PropertySection_Dialog_DefaultValue);
+				.setLabelText(EditorMessages.PropertySection_Dialog_DefaultValue);
 
 		suggestedValueField = new StringDialogField();
 		suggestedValueField
-				.setLabelText(NewEditorResourcesNLS.PropertySection_Dialog_SuggestedValue);
+				.setLabelText(EditorMessages.PropertySection_Dialog_SuggestedValue);
 
 		GridData data = new GridData(GridData.FILL_BOTH);
 		composite.setLayoutData(data);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
index ddf34a10d..5dd9dc118 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
@@ -21,7 +21,7 @@ import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringButtonDialogFiel
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.StringDialogField;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -94,9 +94,9 @@ public class AddEditRendererDialog extends Dialog {
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		if (isNew)
-			newShell.setText(NewEditorResourcesNLS.RendererSection_Dialog_Title_Add);
+			newShell.setText(EditorMessages.RendererSection_Dialog_Title_Add);
 		else
-			newShell.setText(NewEditorResourcesNLS.RendererSection_Dialog_Title_Edit);
+			newShell.setText(EditorMessages.RendererSection_Dialog_Title_Edit);
 	}
 
 	/*
@@ -115,7 +115,7 @@ public class AddEditRendererDialog extends Dialog {
 		tabFolder.setLayoutData(gd);
 		TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
 		generalTabItem
-				.setText(NewEditorResourcesNLS.RendererSection_Dialog_Tab_General);
+				.setText(EditorMessages.RendererSection_Dialog_Tab_General);
 		Control control = createGeneralTabControl(generalTabItem.getParent());
 		generalTabItem.setControl(control);
 		return container;
@@ -136,12 +136,12 @@ public class AddEditRendererDialog extends Dialog {
 
 		rendererNameField = new StringDialogField();
 		rendererNameField
-				.setLabelText(NewEditorResourcesNLS.RendererSection_Dialog_DisplayName);
+				.setLabelText(EditorMessages.RendererSection_Dialog_DisplayName);
 
 		rendererClassField = new ClassButtonDialogField(getProject());
 //		rendererClassField.setRequired(true);
 		rendererClassField
-				.setLabelText(NewEditorResourcesNLS.RendererSection_Dialog_RendererClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.RendererSection_Dialog_RendererClass);//$NON-NLS-1$
 		rendererClassField.setProject(getProject());
 		rendererClassField.setSuperClassName(IFacesConfigConstants.RENDERER_SUPER_CLASS);
 		rendererClassField.setAutoOpenResource(false);
@@ -154,21 +154,21 @@ public class AddEditRendererDialog extends Dialog {
 								shell,
 								page,
 								page.getInput(),
-								NewEditorResourcesNLS.RendererSection_Dialog_ComponentFamilyCaption,
-								NewEditorResourcesNLS.RendererSection_Dialog_ComponentFamilyLabel);
+								EditorMessages.RendererSection_Dialog_ComponentFamilyCaption,
+								EditorMessages.RendererSection_Dialog_ComponentFamilyLabel);
 						if (dialog.open() == Dialog.OK) {
 							componentFamilyField.setText(dialog.getValue());
 						}
 					}
 				});
 		componentFamilyField
-				.setLabelText(NewEditorResourcesNLS.RendererSection_Dialog_ComponentFamilyValue);
+				.setLabelText(EditorMessages.RendererSection_Dialog_ComponentFamilyValue);
 //		componentFamilyField.setRequired(true);
 
 		renderTypeField = new StringDialogField();
 //		renderTypeField.setRequired(true);
 		renderTypeField
-				.setLabelText(NewEditorResourcesNLS.RendererSection_Dialog_TypeValue);
+				.setLabelText(EditorMessages.RendererSection_Dialog_TypeValue);
 
 		GridData data = new GridData(GridData.FILL_BOTH);
 		composite.setLayoutData(data);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
index 7f2c91250..53932bd08 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
@@ -26,7 +26,7 @@ import org.eclipse.jst.jsf.facesconfig.common.dialogfield.JavaUIHelper;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
 import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
 import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.dialogs.SelectionDialog;
 
@@ -40,8 +40,8 @@ public class DialogUtil {
 			String superType, int tyle) {
 		SelectionDialog dialog = (SelectionDialog) JavaUIHelper
 				.openSelectionDialog(shell, project, superType, tyle);
-		dialog.setTitle(NewEditorResourcesNLS.FindType);
-		dialog.setMessage(NewEditorResourcesNLS.FindType_Filter);
+		dialog.setTitle(EditorMessages.FindType);
+		dialog.setMessage(EditorMessages.FindType_Filter);
 		if (dialog.open() == SelectionDialog.OK) {
 			Object[] result = dialog.getResult();
 			IType searchedType = (IType) result[0];
@@ -69,7 +69,7 @@ public class DialogUtil {
 			ListChoiceDialog dialog = new ListChoiceDialog(
 					shell,
 					idArray,
-					NewEditorResourcesNLS.DefaultRenderKitIDSection_Wizard_Page_LabelText);
+					EditorMessages.DefaultRenderKitIDSection_Wizard_Page_LabelText);
 			if (dialog.open() == SelectionDialog.OK) {
 				String result = dialog.getResult();
 				if (!"".equals(result)) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
index 3288ac54b..9a08b7297 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
@@ -23,7 +23,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -118,7 +118,7 @@ public class EditListEntriesDialog extends Dialog {
 		valueClassField = new ClassButtonDialogField(getProject());
 
 		valueClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
 		Composite typeSelectionSection = SWTUtils.createComposite(parent,
 				SWT.NONE);
 
@@ -151,7 +151,7 @@ public class EditListEntriesDialog extends Dialog {
 
 		DialogField valuesTitle = new DialogFieldBase();
 		valuesTitle
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapTable_Title);//$NON-NLS-1$    
+				.setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$    
 
 		valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
 
@@ -184,7 +184,7 @@ public class EditListEntriesDialog extends Dialog {
 
 		TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
 		keyCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Value);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
 		layout.addColumnData(new ColumnWeightData(1, true));
 		keyCol.setResizable(true);
 
@@ -215,7 +215,7 @@ public class EditListEntriesDialog extends Dialog {
 		operationContainer.setLayout(gl);
 
 		Button addButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more); //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -228,7 +228,7 @@ public class EditListEntriesDialog extends Dialog {
 		});
 
 		editButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more);
+				EditorMessages.UI_Button_Edit_more);
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -241,7 +241,7 @@ public class EditListEntriesDialog extends Dialog {
 
 		});
 		removeButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove); //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove); //$NON-NLS-1$
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
index 5397572a1..812233506 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
@@ -27,7 +27,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -126,12 +126,12 @@ public class EditMapEntriesDialog extends Dialog {
 	private void createKeyValueSection(Composite parent) {
 		keyClassField = new ClassButtonDialogField(getProject());
 		keyClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_KeyClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);//$NON-NLS-1$
 
 		valueClassField = new ClassButtonDialogField(getProject());
 
 		valueClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
 
 		Composite typeSelectionSection = SWTUtils.createComposite(parent,
 				SWT.NONE);
@@ -168,7 +168,7 @@ public class EditMapEntriesDialog extends Dialog {
 
 		DialogField valuesTitle = new DialogFieldBase();
 		valuesTitle
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapTable_Title);//$NON-NLS-1$    
+				.setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$    
 
 		valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
 
@@ -200,7 +200,7 @@ public class EditMapEntriesDialog extends Dialog {
 
 		TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
 		keyCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Key);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Key);//$NON-NLS-1$
 		layout.addColumnData(new ColumnWeightData(1, true));
 		keyCol.setResizable(true);
 
@@ -208,7 +208,7 @@ public class EditMapEntriesDialog extends Dialog {
 		layout.addColumnData(new ColumnWeightData(1, true));
 
 		valueCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Value);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
 		valueCol.setResizable(true);
 
 		tableViewer = new TableViewer(mapTable);
@@ -237,7 +237,7 @@ public class EditMapEntriesDialog extends Dialog {
 		operationContainer.setLayout(gl);
 
 		Button addButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more); //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -250,7 +250,7 @@ public class EditMapEntriesDialog extends Dialog {
 		});
 
 		editButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more);
+				EditorMessages.UI_Button_Edit_more);
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -263,7 +263,7 @@ public class EditMapEntriesDialog extends Dialog {
 
 		});
 		removeButton = SWTUtils.createPushButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove); //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove); //$NON-NLS-1$
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
index 8b619316f..9acf2e03d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
@@ -18,7 +18,7 @@ import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogField;
 import org.eclipse.jst.jsf.facesconfig.common.dialogfield.DialogFieldBase;
 import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -103,7 +103,7 @@ public class EditValueDialog extends Dialog {
 		// ManagedBeansPage.ManagedBeanInitializationSection.MapTable.Title =
 		// Values:
 		valueTitle
-				.setLabelText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
+				.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);//$NON-NLS-1$
 		valueTitle.doFillIntoGrid(null, container, 1);
 
 		gd = new GridData(GridData.FILL_BOTH);
@@ -148,7 +148,7 @@ public class EditValueDialog extends Dialog {
 
 		// ManagedBeanPropertyEditDialog.Value = Value:
 		lblValue
-				.setText(NewEditorResourcesNLS.ManagedBeanPropertyEditDialog_Value); //$NON-NLS-1$
+				.setText(EditorMessages.ManagedBeanPropertyEditDialog_Value); //$NON-NLS-1$
 
 		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
 				| GridData.FILL_HORIZONTAL);
@@ -176,7 +176,7 @@ public class EditValueDialog extends Dialog {
 	 */
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(NewEditorResourcesNLS.ValueEditDialog_Title); //$NON-NLS-1$
+		newShell.setText(EditorMessages.ValueEditDialog_Title); //$NON-NLS-1$
 	}
 
 	/*
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
index 49a95137b..d5fad8e9e 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.common.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -90,7 +90,7 @@ public class LocaleDialog extends StatusDialog {
 			itemsList.add(locales[i].toString());
 		}
 		
-		setStatusMessage(NewEditorResourcesNLS.LocaleConfigSection_Wizard_Page_AlreadyExistsError);
+		setStatusMessage(EditorMessages.LocaleConfigSection_Wizard_Page_AlreadyExistsError);
 	}
 	
 	/*
@@ -99,7 +99,7 @@ public class LocaleDialog extends StatusDialog {
 	 */
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(NewEditorResourcesNLS.LocaleConfigSection_Wizard_WindowTitle);
+		newShell.setText(EditorMessages.LocaleConfigSection_Wizard_WindowTitle);
 	}
 
 	/*
@@ -115,7 +115,7 @@ public class LocaleDialog extends StatusDialog {
 		SWTUtils
 				.createLabel(
 						parent,
-						NewEditorResourcesNLS.LocaleConfigSection_Wizard_Page_LabelText,
+						EditorMessages.LocaleConfigSection_Wizard_Page_LabelText,
 						1);
 
 		inputText = SWTUtils.createTextBox(parent, 1);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
index 346cf66e7..028eae649 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jst.jsf.facesconfig.common.IFileFolderConstants;
 import org.eclipse.jst.jsf.facesconfig.common.dialogs.ResourceOnClasspathDialog;
 import org.eclipse.jst.jsf.facesconfig.emf.MessageBundleType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.swt.widgets.Shell;
 
 /**
@@ -29,9 +29,9 @@ public class MessageBundleSelectionDialog extends ResourceOnClasspathDialog {
 	/** A list contains the resoursebundles existing in faces config */
 	private List resourceBundles;
 
-	private String selectPropertyFileMessage = NewEditorResourcesNLS.MessageBundleSection_Dialog_Message_SelectPropertyFile; 
+	private String selectPropertyFileMessage = EditorMessages.MessageBundleSection_Dialog_Message_SelectPropertyFile; 
 
-	private String alreadyExistStatusMessage = NewEditorResourcesNLS.MessageBundleSection_Dialog_Message_AlreadyExists; 
+	private String alreadyExistStatusMessage = EditorMessages.MessageBundleSection_Dialog_Message_AlreadyExists; 
 
 	private static final String[] PROPERTIES_FILES_SUFFIXS = new String[] { IFileFolderConstants.EXT_PROPERTIES };
 
@@ -46,7 +46,7 @@ public class MessageBundleSelectionDialog extends ResourceOnClasspathDialog {
 		this.resourceBundles = resourceBundles;
 		setSuffixs(PROPERTIES_FILES_SUFFIXS);
 		
-		setTitle(NewEditorResourcesNLS.MessageBundleSection_Dialog_Title);
+		setTitle(EditorMessages.MessageBundleSection_Dialog_Title);
 		setViewerSorter(new MessageBundleViewerSorter());
 	}
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
index 2d89e40eb..e15062743 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
@@ -32,7 +32,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
 import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
 import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
 import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ComponentDetailsPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ConverterDetailsPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.detail.RenderkitDetailsPage;
@@ -70,7 +70,7 @@ public class ComponentsPage extends FacesConfigMasterDetailPage {
 	 */
 	public ComponentsPage(FacesConfigEditor editor) {
 		super(editor, "ComponentsPage",
-				NewEditorResourcesNLS.FacesConfigEditor_Components_TabName);
+				EditorMessages.FacesConfigEditor_Components_TabName);
 	}
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
index b68a3644c..da3a8c382 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jst.jsf.facesconfig.common.guiutils.IntroductionSection;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -37,7 +37,7 @@ public class IntroductionPage extends FormPage implements IFacesConfigPage, ISel
 	 */
 	public IntroductionPage(FacesConfigEditor facesConfigEditor) {
 		super(facesConfigEditor, IntroductionPage.class.getName(),
-				NewEditorResourcesNLS.editor_pageflow_page_intro_name);
+				EditorMessages.editor_pageflow_page_intro_name);
 	}
 
 	/*
@@ -49,7 +49,7 @@ public class IntroductionPage extends FormPage implements IFacesConfigPage, ISel
 		// get the form
 		ScrolledForm form = managedForm.getForm();
 		FormToolkit toolkit = getEditor().getToolkit();
-		form.setText(NewEditorResourcesNLS.editor_pageflow_page_intro_title);
+		form.setText(EditorMessages.editor_pageflow_page_intro_title);
 
 		form.setBackgroundImage(EditorPlugin.getDefault().getImage("form_banner.gif"));
 
@@ -61,8 +61,8 @@ public class IntroductionPage extends FormPage implements IFacesConfigPage, ISel
 
 		IntroductionSection introPart = new IntroductionSection(
 				FacesConfigEditor.EDITOR_ID, managedForm, toolkit,
-				NewEditorResourcesNLS.editor_pageflow_page_intro_help_HelpContextID,
-				NewEditorResourcesNLS.editor_pageflow_page_intro_help_HelpToolTip);
+				EditorMessages.editor_pageflow_page_intro_help_HelpContextID,
+				EditorMessages.editor_pageflow_page_intro_help_HelpToolTip);
 
 		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
 		td.colspan = 1;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
index 6332da55f..b21692146 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
@@ -29,7 +29,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
 import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ManagedBeanDetailsPage;
 import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
 import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanMasterSection;
@@ -54,7 +54,7 @@ public class ManagedBeanPage extends FacesConfigMasterDetailPage {
 
 	public ManagedBeanPage(FacesConfigEditor editor) {
 		super(editor, "ManagedBeanPage",
-				NewEditorResourcesNLS.FacesConfigEditor_ManagedBeans_TabName);
+				EditorMessages.FacesConfigEditor_ManagedBeans_TabName);
 	}
 
 	protected FacesConfigMasterSection[] createMasterSections(
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
index 416d41475..198aa357a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
@@ -42,7 +42,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
 import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
 import org.eclipse.jst.jsf.facesconfig.ui.section.ApplicationSection;
 import org.eclipse.jst.jsf.facesconfig.ui.section.FactorySection;
@@ -102,13 +102,13 @@ public class OthersPage extends FormPage implements IFacesConfigPage,
 	 */
 	public OthersPage(FacesConfigEditor editor) {
 		super(editor, "OthersPage",
-				NewEditorResourcesNLS.FacesConfigEditor_Others_TabName);
+				EditorMessages.FacesConfigEditor_Others_TabName);
 	}
 
 	protected void createFormContent(IManagedForm managedForm) {
 		super.createFormContent(managedForm);
 		ScrolledForm form = managedForm.getForm();
-		form.setText(NewEditorResourcesNLS.OthersPage_Title);
+		form.setText(EditorMessages.OthersPage_Title);
 		form.setBackgroundImage(BANNER_IMAGE);
 		fillBody(managedForm, managedForm.getToolkit());
 		managedForm.refresh();
@@ -144,8 +144,8 @@ public class OthersPage extends FormPage implements IFacesConfigPage,
 		OthersPageBaseSection section = new ApplicationSection(
 				FacesConfigPackage.eINSTANCE.getActionListenerType(),
 				leftContainer, managedForm, this, toolkit);
-		initSection(section, NewEditorResourcesNLS.ActionListenerSection_Name,
-				NewEditorResourcesNLS.ActionListenerSection_Description,
+		initSection(section, EditorMessages.ActionListenerSection_Name,
+				EditorMessages.ActionListenerSection_Description,
 				sectionList);
 		section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
 		section.getSection().setExpanded(true);
@@ -154,60 +154,60 @@ public class OthersPage extends FormPage implements IFacesConfigPage,
 				.getDefaultRenderKitIdType(), leftContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.DefaultRenderKitIDSection_Name,
-				NewEditorResourcesNLS.DefaultRenderKitIDSection_Description,
+				EditorMessages.DefaultRenderKitIDSection_Name,
+				EditorMessages.DefaultRenderKitIDSection_Description,
 				sectionList);
 
 		section = new LocaleConfigSection(FacesConfigPackage.eINSTANCE
 				.getSupportedLocaleType(), leftContainer, managedForm, this,
 				toolkit);
-		initSection(section, NewEditorResourcesNLS.LocaleConfigSection_Name,
-				NewEditorResourcesNLS.LocaleConfigSection_Description,
+		initSection(section, EditorMessages.LocaleConfigSection_Name,
+				EditorMessages.LocaleConfigSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getMessageBundleType(), leftContainer, managedForm, this,
 				toolkit);
-		initSection(section, NewEditorResourcesNLS.MessageBundleSection_Name,
-				NewEditorResourcesNLS.MessageBundleSection_Description,
+		initSection(section, EditorMessages.MessageBundleSection_Name,
+				EditorMessages.MessageBundleSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getNavigationHandlerType(), leftContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.NavigationHandlerSection_Name,
-				NewEditorResourcesNLS.NavigationHandlerSection_Description,
+				EditorMessages.NavigationHandlerSection_Name,
+				EditorMessages.NavigationHandlerSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getPropertyResolverType(), leftContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.PropertyResolverSection_Name,
-				NewEditorResourcesNLS.PropertyResolverSection_Description,
+				EditorMessages.PropertyResolverSection_Name,
+				EditorMessages.PropertyResolverSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getStateManagerType(), leftContainer, managedForm, this,
 				toolkit);
-		initSection(section, NewEditorResourcesNLS.StateManagerSection_Name,
-				NewEditorResourcesNLS.StateManagerSection_Description,
+		initSection(section, EditorMessages.StateManagerSection_Name,
+				EditorMessages.StateManagerSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getVariableResolverType(), leftContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.VariableResolverSection_Name,
-				NewEditorResourcesNLS.VariableResolverSection_Description,
+				EditorMessages.VariableResolverSection_Name,
+				EditorMessages.VariableResolverSection_Description,
 				sectionList);
 
 		section = new ApplicationSection(FacesConfigPackage.eINSTANCE
 				.getViewHandlerType(), leftContainer, managedForm, this,
 				toolkit);
-		initSection(section, NewEditorResourcesNLS.ViewHandlerSection_Name,
-				NewEditorResourcesNLS.ViewHandlerSection_Description,
+		initSection(section, EditorMessages.ViewHandlerSection_Name,
+				EditorMessages.ViewHandlerSection_Description,
 				sectionList);
 
 		leftSections = sectionList;
@@ -222,8 +222,8 @@ public class OthersPage extends FormPage implements IFacesConfigPage,
 				.getApplicationFactoryType(), rightContainer, managedForm,
 				this, toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.ApplicationFactorySection_Name,
-				NewEditorResourcesNLS.ApplicationFactorySection_Description,
+				EditorMessages.ApplicationFactorySection_Name,
+				EditorMessages.ApplicationFactorySection_Description,
 				sectionList);
 		section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
 		section.getSection().setExpanded(true);
@@ -232,31 +232,31 @@ public class OthersPage extends FormPage implements IFacesConfigPage,
 				.getFacesContextFactoryType(), rightContainer, managedForm,
 				this, toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.FacesContextFactorySection_Name,
-				NewEditorResourcesNLS.FacesContextFactorySection_Description,
+				EditorMessages.FacesContextFactorySection_Name,
+				EditorMessages.FacesContextFactorySection_Description,
 				sectionList);
 
 		section = new FactorySection(FacesConfigPackage.eINSTANCE
 				.getLifecycleFactoryType(), rightContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.LifecycleFactorySection_Name,
-				NewEditorResourcesNLS.LifecycleFactorySection_Description,
+				EditorMessages.LifecycleFactorySection_Name,
+				EditorMessages.LifecycleFactorySection_Description,
 				sectionList);
 
 		section = new FactorySection(FacesConfigPackage.eINSTANCE
 				.getRenderKitFactoryType(), rightContainer, managedForm, this,
 				toolkit);
 		initSection(section,
-				NewEditorResourcesNLS.RenderKitFactorySection_Name,
-				NewEditorResourcesNLS.RenderKitFactorySection_Description,
+				EditorMessages.RenderKitFactorySection_Name,
+				EditorMessages.RenderKitFactorySection_Description,
 				sectionList);
 
 		section = new LifecycleSection(FacesConfigPackage.eINSTANCE
 				.getPhaseListenerType(), rightContainer, managedForm, this,
 				toolkit);
-		initSection(section, NewEditorResourcesNLS.PhaseListenerSection_Name,
-				NewEditorResourcesNLS.PhaseListenerSection_Description,
+		initSection(section, EditorMessages.PhaseListenerSection_Name,
+				EditorMessages.PhaseListenerSection_Description,
 				sectionList);
 
 		rightSections = sectionList;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
index 1faf20b26..628d492e8 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
@@ -18,7 +18,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewComponentsSection;
 import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewGeneralSection;
 import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewManagedBeanSection;
@@ -74,7 +74,7 @@ public class OverviewPage extends FormPage implements ISelectionProvider,
 	protected void createFormContent(IManagedForm managedForm) {
 
 		ScrolledForm form = managedForm.getForm();
-		form.setText(NewEditorResourcesNLS.OverviewPage_PageflowOverview_summary);
+		form.setText(EditorMessages.OverviewPage_PageflowOverview_summary);
 		form.setBackgroundImage(EditorPlugin.getDefault().getImage(
 				"form_banner.gif")); //$NON-NLS-1$
 		Composite body = form.getBody();
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
index 43eafc629..fc93583fc 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
@@ -39,7 +39,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditAttributeDialog;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
@@ -77,9 +77,9 @@ public class AttributeSection extends AbstractFacesConfigSection  {
 	public AttributeSection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
-		this.getSection().setText(NewEditorResourcesNLS.AttributeSection_Name);
+		this.getSection().setText(EditorMessages.AttributeSection_Name);
 		this.getSection().setDescription(
-				NewEditorResourcesNLS.AttributeSection_Description);
+				EditorMessages.AttributeSection_Description);
 
 	}
 
@@ -145,22 +145,22 @@ public class AttributeSection extends AbstractFacesConfigSection  {
 		TableColumn nameCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		nameCol
-				.setText(NewEditorResourcesNLS.AttributeSection_Table_NameColumn);
+				.setText(EditorMessages.AttributeSection_Table_NameColumn);
 
 		TableColumn classCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		classCol
-				.setText(NewEditorResourcesNLS.AttributeSection_Table_ClassColumn);
+				.setText(EditorMessages.AttributeSection_Table_ClassColumn);
 
 		TableColumn valueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.AttributeSection_Table_DefaultValueColumn);
+				.setText(EditorMessages.AttributeSection_Table_DefaultValueColumn);
 
 		TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		suggestedValueCol
-				.setText(NewEditorResourcesNLS.AttributeSection_Table_SuggestedValueColumn);
+				.setText(EditorMessages.AttributeSection_Table_SuggestedValueColumn);
 
 		table.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -221,7 +221,7 @@ public class AttributeSection extends AbstractFacesConfigSection  {
 		operationContainer.setLayout(gl);
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -229,7 +229,7 @@ public class AttributeSection extends AbstractFacesConfigSection  {
 		addButton.setLayoutData(gd);
 
 		editButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -237,7 +237,7 @@ public class AttributeSection extends AbstractFacesConfigSection  {
 		editButton.setLayoutData(gd);
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
index 31d4f7823..e617aada3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
@@ -33,7 +33,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
 import org.eclipse.swt.layout.GridData;
@@ -73,9 +73,9 @@ public class ComponentGeneralSection extends AbstractFacesConfigSection {
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
 		getSection()
-				.setText(NewEditorResourcesNLS.ComponentGeneralSection_Name);
+				.setText(EditorMessages.ComponentGeneralSection_Name);
 		getSection().setDescription(
-				NewEditorResourcesNLS.ComponentGeneralSection_Description);
+				EditorMessages.ComponentGeneralSection_Description);
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class ComponentGeneralSection extends AbstractFacesConfigSection {
 		toolkit.paintBordersFor(container);
 		displayNameField = new StringDialogField();
 		displayNameField
-				.setLabelText(NewEditorResourcesNLS.ComponentGeneralSection_Label_DisplayName);
+				.setLabelText(EditorMessages.ComponentGeneralSection_Label_DisplayName);
 		displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		displayNameField
@@ -132,7 +132,7 @@ public class ComponentGeneralSection extends AbstractFacesConfigSection {
 
 		descriptionField = new StringDialogField(2);
 		descriptionField
-				.setLabelText(NewEditorResourcesNLS.ComponentGeneralSection_Label_Description);
+				.setLabelText(EditorMessages.ComponentGeneralSection_Label_Description);
 		descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		descriptionField
@@ -174,7 +174,7 @@ public class ComponentGeneralSection extends AbstractFacesConfigSection {
 
 		componentTypeField = new StringDialogField();
 		componentTypeField
-				.setLabelText(NewEditorResourcesNLS.ComponentGeneralSection_Label_ComponentType);
+				.setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentType);
 		componentTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		componentTypeField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
@@ -201,7 +201,7 @@ public class ComponentGeneralSection extends AbstractFacesConfigSection {
 
 		componentClassField = new ClassButtonDialogField(null);
 		componentClassField
-				.setLabelText(NewEditorResourcesNLS.ComponentGeneralSection_Label_ComponentClass);
+				.setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentClass);
 		componentClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		LayoutUtil.setHorizontalGrabbing(componentClassField.getTextControl(
 				toolkit, container));
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
index 042395fb1..a150a60e8 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -47,9 +47,9 @@ public class ComponentMasterSection extends FacesConfigMasterSection {
 	public ComponentMasterSection(Composite parent, IManagedForm managedForm,
 			FormToolkit toolkit, FacesConfigMasterDetailPage page) {
 		super(parent, managedForm, toolkit, page, null, null);
-		getSection().setText(NewEditorResourcesNLS.ComponentMasterSection_Name); //$NON-NLS-1$
+		getSection().setText(EditorMessages.ComponentMasterSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.ComponentMasterSection_Description);
+				EditorMessages.ComponentMasterSection_Description);
 	}
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
index d0931cf37..8facc8a4b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
@@ -38,7 +38,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
 import org.eclipse.swt.layout.GridData;
@@ -76,9 +76,9 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
 		getSection()
-				.setText(NewEditorResourcesNLS.ConverterGeneralSection_Name);
+				.setText(EditorMessages.ConverterGeneralSection_Name);
 		getSection().setDescription(
-				NewEditorResourcesNLS.ConverterGeneralSection_Description);
+				EditorMessages.ConverterGeneralSection_Description);
 	}
 
 	/**
@@ -94,7 +94,7 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 		toolkit.paintBordersFor(container);
 		displayNameField = new StringDialogField();
 		displayNameField
-				.setLabelText(NewEditorResourcesNLS.ConverterGeneralSection_Label_DisplayName);
+				.setLabelText(EditorMessages.ConverterGeneralSection_Label_DisplayName);
 		displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		displayNameField
@@ -134,7 +134,7 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 
 		descriptionField = new StringDialogField(2);
 		descriptionField
-				.setLabelText(NewEditorResourcesNLS.ConverterGeneralSection_Label_Description);
+				.setLabelText(EditorMessages.ConverterGeneralSection_Label_Description);
 		descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		descriptionField
@@ -176,7 +176,7 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 		converterIdField = new StringDialogField();
 		// converterIdField.setRequired(true);
 		converterIdField
-				.setLabelText(NewEditorResourcesNLS.ConverterGeneralSection_Label_ConverterID);
+				.setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterID);
 		converterIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		converterIdField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
@@ -214,7 +214,7 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 		converterForClassField = new ClassButtonDialogField(null);
 		// converterForClassField.setRequired(true);
 		converterForClassField
-				.setLabelText(NewEditorResourcesNLS.ConverterGeneralSection_Label_ConverterForClass);
+				.setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterForClass);
 		converterForClassField.setProject((IProject) getPage().getEditor()
 				.getAdapter(IProject.class));
 		converterForClassField.doFillIntoGrid(toolkit, container,
@@ -258,7 +258,7 @@ public class ConverterGeneralSection extends AbstractFacesConfigSection {
 		converterClassField = new ClassButtonDialogField(null);
 		// converterClassField.setRequired(true);
 		converterClassField
-				.setLabelText(NewEditorResourcesNLS.ConverterGeneralSection_Label_ConverterClass);
+				.setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterClass);
 		converterClassField.setProject((IProject) getPage().getEditor()
 				.getAdapter(IProject.class));
 		converterClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
index 031501220..887124630 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -46,9 +46,9 @@ public class ConverterMasterSection extends FacesConfigMasterSection {
 	public ConverterMasterSection(Composite parent, IManagedForm managedForm,
 			FormToolkit toolkit, FacesConfigMasterDetailPage page) {
 		super(parent, managedForm, toolkit, page, null, null);
-		getSection().setText(NewEditorResourcesNLS.ConverterMasterSection_Name); //$NON-NLS-1$
+		getSection().setText(EditorMessages.ConverterMasterSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.ConverterMasterSection_Description);
+				EditorMessages.ConverterMasterSection_Description);
 	}
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
index adce6fca4..d53073c2f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
@@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -138,7 +138,7 @@ public class FacesConfigMasterSection extends AbstractFacesConfigSection {
 		operationContainer.setLayout(layout);
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add, SWT.PUSH);
+				EditorMessages.UI_Button_Add, SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
 		gd.grabExcessHorizontalSpace = false;
@@ -151,7 +151,7 @@ public class FacesConfigMasterSection extends AbstractFacesConfigSection {
 		});
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, SWT.PUSH);
+				EditorMessages.UI_Button_Remove, SWT.PUSH);
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
index a3f281bd5..db5f1b793 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
@@ -37,7 +37,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.FacetNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditFacetDialog;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
@@ -75,9 +75,9 @@ public class FacetSection extends AbstractFacesConfigSection {
 	public FacetSection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
-		this.getSection().setText(NewEditorResourcesNLS.FacetSection_Name);
+		this.getSection().setText(EditorMessages.FacetSection_Name);
 		this.getSection().setDescription(
-				NewEditorResourcesNLS.FacetSection_Description);
+				EditorMessages.FacetSection_Description);
 
 	}
 
@@ -141,16 +141,16 @@ public class FacetSection extends AbstractFacesConfigSection {
 		TableColumn facetNameCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		facetNameCol
-				.setText(NewEditorResourcesNLS.FacetSection_Table_FacetNameColumn);
+				.setText(EditorMessages.FacetSection_Table_FacetNameColumn);
 		TableColumn displayNameCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		displayNameCol
-				.setText(NewEditorResourcesNLS.FacetSection_Table_DisplayNameColumn);//$NON-NLS-1$
+				.setText(EditorMessages.FacetSection_Table_DisplayNameColumn);//$NON-NLS-1$
 
 		TableColumn descriptionCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		descriptionCol
-				.setText(NewEditorResourcesNLS.FacetSection_Table_DescriptionColumn);
+				.setText(EditorMessages.FacetSection_Table_DescriptionColumn);
 
 		table.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -198,7 +198,7 @@ public class FacetSection extends AbstractFacesConfigSection {
 		operationContainer.setLayout(gl);
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -206,7 +206,7 @@ public class FacetSection extends AbstractFacesConfigSection {
 		addButton.setLayoutData(gd);
 
 		editButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -214,7 +214,7 @@ public class FacetSection extends AbstractFacesConfigSection {
 		editButton.setLayoutData(gd);
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
index 0aeea6107..553713c83 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
@@ -22,7 +22,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -39,11 +39,11 @@ import org.eclipse.ui.part.PageBook;
  * @author Xiao-guang Zhang, sfshi
  */
 public class InitializationSection extends AbstractFacesConfigSection {
-	private static final String MANAGEDBEAN_GENERAL_CLASS = NewEditorResourcesNLS.InitializationSection_ClassType_General;
+	private static final String MANAGEDBEAN_GENERAL_CLASS = EditorMessages.InitializationSection_ClassType_General;
 
-	private static final String MANAGEDBEAN_MAP = NewEditorResourcesNLS.InitializationSection_ClassType_Map;
+	private static final String MANAGEDBEAN_MAP = EditorMessages.InitializationSection_ClassType_Map;
 
-	private static final String MANAGEDBEAN_LIST = NewEditorResourcesNLS.InitializationSection_ClassType_List;
+	private static final String MANAGEDBEAN_LIST = EditorMessages.InitializationSection_ClassType_List;
 
 	/** property initiliazation container composite */
 	private Composite propertySection;
@@ -80,9 +80,9 @@ public class InitializationSection extends AbstractFacesConfigSection {
 	public InitializationSection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null); //$NON-NLS-1$
-		getSection().setText(NewEditorResourcesNLS.InitializationSection_Name); //$NON-NLS-1$
+		getSection().setText(EditorMessages.InitializationSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.InitializationSection_Description); //$NON-NLS-1$
+				EditorMessages.InitializationSection_Description); //$NON-NLS-1$
 
 	}
 
@@ -116,7 +116,7 @@ public class InitializationSection extends AbstractFacesConfigSection {
 		String[] items = { MANAGEDBEAN_GENERAL_CLASS, MANAGEDBEAN_MAP,
 				MANAGEDBEAN_LIST };
 		beanTypeField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_ClassType);
+				.setLabelText(EditorMessages.InitializationSection_ClassType);
 		beanTypeField.setItems(items);
 		beanTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		beanTypeField
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
index 47370d072..b1cdea557 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
@@ -51,7 +51,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.EditValueDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -162,7 +162,7 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		valueClassField = new ClassButtonDialogField(getProject());
 
 		valueClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);//$NON-NLS-1$
 		valueClassField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
 
@@ -232,7 +232,7 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		listValueSection.setLayout(gl);
 		DialogFieldBase valuesTitle = new DialogFieldBase();
 		valuesTitle
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapTable_Title);//$NON-NLS-1$    
+				.setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$    
 		valuesTitle.doFillIntoGrid(toolkit, listValueSection, numberOfColumns);
 
 		// list's value table
@@ -267,7 +267,7 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		TableColumn valueCol = new TableColumn(listTable, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Value);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
 		valueCol.setResizable(true);
 
 		listTable.addMouseListener(new MouseAdapter() {
@@ -308,11 +308,11 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		Button addButton = null;
 		if (toolkit != null) {
 			addButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+					EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 					SWT.PUSH);
 		} else {
 			addButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Add_more); //$NON-NLS-1$
+					EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
 		}
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -322,10 +322,10 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		editButton = null;
 		if (toolkit != null) {
 			editButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Edit_more, SWT.PUSH);
+					EditorMessages.UI_Button_Edit_more, SWT.PUSH);
 		} else {
 			editButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Edit_more);
+					EditorMessages.UI_Button_Edit_more);
 		}
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
@@ -336,11 +336,11 @@ public class ListEntriesEditGroup extends DialogFieldGroup implements
 		removeButton = null;
 		if (toolkit != null) {
 			removeButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+					EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 					SWT.PUSH);
 		} else {
 			removeButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Remove); //$NON-NLS-1$
+					EditorMessages.UI_Button_Remove); //$NON-NLS-1$
 		}
 
 		gd = new GridData(GridData.FILL_HORIZONTAL
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
index 394dd0b04..16c22ab7f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
@@ -31,7 +31,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
@@ -65,9 +65,9 @@ public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
 			IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
 		getSection().setText(
-				NewEditorResourcesNLS.ManagedBeanGeneralSection_Name);
+				EditorMessages.ManagedBeanGeneralSection_Name);
 		getSection().setDescription(
-				NewEditorResourcesNLS.ManagedBeanGeneralSection_Desc);
+				EditorMessages.ManagedBeanGeneralSection_Desc);
 	}
 
 	protected void createContents(Composite container, FormToolkit toolkit) {
@@ -95,7 +95,7 @@ public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
 			int numberOfColumns) {
 		mbNameField = new StringDialogField();
 		mbNameField
-				.setLabelText(NewEditorResourcesNLS.ManagedBeanGeneralSection_ManagedBeanName);//$NON-NLS-1$
+				.setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanName);//$NON-NLS-1$
 		mbNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		LayoutUtil.setHorizontalGrabbing(mbNameField.getTextControl(toolkit,
 				container));
@@ -140,7 +140,7 @@ public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
 			final FormToolkit toolkit, int numberOfColumns) {
 		mbClassField = new ClassButtonDialogField(null);
 		mbClassField
-				.setLabelText(NewEditorResourcesNLS.ManagedBeanGeneralSection_ManagedBeanClass);//$NON-NLS-1$
+				.setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanClass);//$NON-NLS-1$
 		mbClassField.setProject((IProject) getPage().getEditor().getAdapter(
 				IProject.class));
 		mbClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
@@ -187,7 +187,7 @@ public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
 			int numberOfColumns) {
 		mbScopeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
 		mbScopeField
-				.setLabelText(NewEditorResourcesNLS.ManagedBeanGeneralSection_ManagedBeanScope);//$NON-NLS-1$
+				.setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanScope);//$NON-NLS-1$
 		mbScopeField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		LayoutUtil.setHorizontalGrabbing(mbScopeField.getComboControl(toolkit,
 				container));
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
index dd50cadc9..de6ba02ed 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
@@ -40,7 +40,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
 import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanContentProvider;
 import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanLabelProvider;
@@ -71,9 +71,9 @@ public class ManagedBeanMasterSection extends FacesConfigMasterSection {
 			FormToolkit toolkit, FacesConfigMasterDetailPage page) {
 		super(parent, managedForm, toolkit, page, null, null);
 		getSection().setText(
-				NewEditorResourcesNLS.ManagedBeanMasterSection_Name); //$NON-NLS-1$
+				EditorMessages.ManagedBeanMasterSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.ManagedBeanMasterSection_Description);
+				EditorMessages.ManagedBeanMasterSection_Description);
 	}
 
 	protected StructuredViewer createViewer(Composite parent,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
index 2bdcb3836..96c9b5a2c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
@@ -49,7 +49,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditManagedPropertyDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -186,19 +186,19 @@ public class ManagedPropertyEditGroup extends DialogFieldGroup implements
 		TableColumn propertyCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		propertyCol
-				.setText(NewEditorResourcesNLS.InitializationSection_PropertyTable_Name);
+				.setText(EditorMessages.InitializationSection_PropertyTable_Name);
 		propertyCol.setResizable(true);
 
 		TableColumn classCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		classCol
-				.setText(NewEditorResourcesNLS.InitializationSection_PropertyTable_Class);
+				.setText(EditorMessages.InitializationSection_PropertyTable_Class);
 		classCol.setResizable(true);
 
 		TableColumn valueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.InitializationSection_PropertyTable_Value);
+				.setText(EditorMessages.InitializationSection_PropertyTable_Value);
 		valueCol.setResizable(true);
 
 		table.addSelectionListener(new SelectionAdapter() {
@@ -261,14 +261,14 @@ public class ManagedPropertyEditGroup extends DialogFieldGroup implements
 
 		// create list operation buttons
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more, SWT.PUSH);
+				EditorMessages.UI_Button_Add_more, SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
 		gd.grabExcessHorizontalSpace = false;
 		addButton.setLayoutData(gd);
 
 		editButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -276,7 +276,7 @@ public class ManagedPropertyEditGroup extends DialogFieldGroup implements
 		editButton.setLayoutData(gd);
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
index da6c58284..83e943998 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
@@ -54,7 +54,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditMapEntryDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
@@ -165,7 +165,7 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 		typeSelectionSection.setLayout(gl);
 		keyClassField = new ClassButtonDialogField(getProject());
 		keyClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_KeyClass);
+				.setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);
 		keyClassField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
 
@@ -210,7 +210,7 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 		valueClassField = new ClassButtonDialogField(getProject());
 
 		valueClassField
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapType_ValueClass);
+				.setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
 		valueClassField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
 
@@ -283,7 +283,7 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 		mapValueSection.setLayout(gl);
 		DialogField valuesTitle = new DialogFieldBase();
 		valuesTitle
-				.setLabelText(NewEditorResourcesNLS.InitializationSection_MapTable_Title);//$NON-NLS-1$    
+				.setLabelText(EditorMessages.InitializationSection_MapTable_Title);//$NON-NLS-1$    
 
 		valuesTitle.doFillIntoGrid(toolkit, mapValueSection, numberOfColumns);
 		Table table;
@@ -313,14 +313,14 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 
 		TableColumn keyCol = new TableColumn(table, SWT.NONE);
 		keyCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Key);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Key);//$NON-NLS-1$
 		layout.addColumnData(new ColumnWeightData(1, true));
 		keyCol.setResizable(true);
 
 		TableColumn valueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.InitializationSection_MapTable_Value);//$NON-NLS-1$
+				.setText(EditorMessages.InitializationSection_MapTable_Value);//$NON-NLS-1$
 		valueCol.setResizable(true);
 		table.addMouseListener(new MouseAdapter() {
 			public void mouseDoubleClick(MouseEvent e) {
@@ -359,11 +359,11 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 		Button addButton = null;
 		if (toolkit != null) {
 			addButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+					EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 					SWT.PUSH);
 		} else {
 			addButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Add_more); //$NON-NLS-1$
+					EditorMessages.UI_Button_Add_more); //$NON-NLS-1$
 		}
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -372,10 +372,10 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 
 		if (toolkit != null) {
 			editButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Edit_more, SWT.PUSH);
+					EditorMessages.UI_Button_Edit_more, SWT.PUSH);
 		} else {
 			editButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Edit_more); //$NON-NLS-1$
+					EditorMessages.UI_Button_Edit_more); //$NON-NLS-1$
 		}
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -384,11 +384,11 @@ public class MapEntriesEditGroup extends DialogFieldGroup implements
 
 		if (toolkit != null) {
 			removeButton = toolkit.createButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+					EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 					SWT.PUSH);
 		} else {
 			removeButton = SWTUtils.createPushButton(operationContainer,
-					NewEditorResourcesNLS.UI_Button_Remove); //$NON-NLS-1$
+					EditorMessages.UI_Button_Remove); //$NON-NLS-1$
 		}
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
index 6f05c107e..fb2e310d3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
@@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
 import org.eclipse.swt.SWT;
@@ -155,7 +155,7 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection {
 		operationContainer.setLayout(new GridLayout());
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add, SWT.PUSH);
+				EditorMessages.UI_Button_Add, SWT.PUSH);
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
 		gd.grabExcessHorizontalSpace = false;
@@ -172,7 +172,7 @@ public abstract class OthersPageBaseSection extends AbstractFacesConfigSection {
 		});
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, SWT.PUSH);
+				EditorMessages.UI_Button_Remove, SWT.PUSH);
 
 		removeButton.setEnabled(true);
 		gd = new GridData(GridData.FILL_HORIZONTAL
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
index f1f33b9ba..41103d6b4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
@@ -44,8 +44,8 @@ public class OverviewComponentsSection extends AbstractOverviewSection {
 	public OverviewComponentsSection(Composite parent,
 			IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, ComponentsPage.PAGE_ID,
-				NewEditorResourcesNLS.OverviewPage_ComponentsSection_name,
-				NewEditorResourcesNLS.OverviewPage_ComponentsSection_description,
+				EditorMessages.OverviewPage_ComponentsSection_name,
+				EditorMessages.OverviewPage_ComponentsSection_description,
 				null, null);
 	}
 
@@ -93,13 +93,13 @@ public class OverviewComponentsSection extends AbstractOverviewSection {
 		TableColumn typecol = new TableColumn(table, SWT.LEFT);
 		tablelayout.addColumnData(new ColumnWeightData(1, true));
 		typecol
-				.setText(NewEditorResourcesNLS.OverviewPage_ComponentsSection_table_typecol);
+				.setText(EditorMessages.OverviewPage_ComponentsSection_table_typecol);
 		typecol.setResizable(true);
 
 		TableColumn namecol = new TableColumn(table, SWT.LEFT);
 		tablelayout.addColumnData(new ColumnWeightData(1, true));
 		namecol
-				.setText(NewEditorResourcesNLS.OverviewPage_ComponentsSection_table_namecol);
+				.setText(EditorMessages.OverviewPage_ComponentsSection_table_namecol);
 		namecol.setResizable(true);
 
 		return table;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
index e0f0edb17..fba5fd8aa 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
@@ -12,7 +12,7 @@
 package org.eclipse.jst.jsf.facesconfig.ui.section;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -43,9 +43,9 @@ public class OverviewGeneralSection extends AbstractFacesConfigSection {
 		super(parent, managedForm, page, toolkit, null, null);
 
 		getSection().setText(
-				NewEditorResourcesNLS.OverviewPage_GeneralSection_name); //$NON-NLS-1$
+				EditorMessages.OverviewPage_GeneralSection_name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.OverviewPage_GeneralSection_description); //$NON-NLS-1$
+				EditorMessages.OverviewPage_GeneralSection_description); //$NON-NLS-1$
 	}
 
 	/*
@@ -62,14 +62,14 @@ public class OverviewGeneralSection extends AbstractFacesConfigSection {
 		IEditorInput editorInput = this.getPage().getEditor().getEditorInput();
 
 		toolkit.createLabel(container,
-				NewEditorResourcesNLS.OverviewPage_GeneralSection_label_name); //$NON-NLS-1$ 	 
+				EditorMessages.OverviewPage_GeneralSection_label_name); //$NON-NLS-1$ 	 
 		Text typeText = toolkit.createText(container, ((FileEditorInput)editorInput).getName());
 		typeText.setEditable(false);
 		GridData data = new GridData(GridData.FILL_HORIZONTAL);
 		typeText.setLayoutData(data);
 
 		toolkit.createLabel(container,
-				NewEditorResourcesNLS.OverviewPage_GeneralSection_label_version); //$NON-NLS-1$
+				EditorMessages.OverviewPage_GeneralSection_label_version); //$NON-NLS-1$
 		versionText = toolkit.createText(container, "");
 		versionText.setLayoutData(data);
 		versionText.setEditable(false);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
index e3e55ee63..b3273ac50 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage;
 import org.eclipse.swt.SWT;
@@ -45,8 +45,8 @@ public class OverviewManagedBeanSection extends AbstractOverviewSection {
 	public OverviewManagedBeanSection(Composite parent,
 			IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, ManagedBeanPage.PAGE_ID,
-				NewEditorResourcesNLS.OverviewPage_ManagedBeanSection_name,
-				NewEditorResourcesNLS.OverviewPage_ManagedBeanSection_description,
+				EditorMessages.OverviewPage_ManagedBeanSection_name,
+				EditorMessages.OverviewPage_ManagedBeanSection_description,
 				null, null);
 
 	}
@@ -88,19 +88,19 @@ public class OverviewManagedBeanSection extends AbstractOverviewSection {
 
 		TableColumn namecol = new TableColumn(table, SWT.LEFT);
 		namecol
-				.setText(NewEditorResourcesNLS.OverviewPage_ManagedBeanSection_table_namecol);
+				.setText(EditorMessages.OverviewPage_ManagedBeanSection_table_namecol);
 		tablelayout.addColumnData(new ColumnWeightData(1, true));
 		namecol.setResizable(true);
 
 		TableColumn scopecol = new TableColumn(table, SWT.LEFT);
 		scopecol
-				.setText(NewEditorResourcesNLS.OverviewPage_ManagedBeanSection_table_scopecol);
+				.setText(EditorMessages.OverviewPage_ManagedBeanSection_table_scopecol);
 		tablelayout.addColumnData(new ColumnWeightData(1, true));
 		scopecol.setResizable(true);
 
 		TableColumn classcol = new TableColumn(table, SWT.LEFT);
 		classcol
-				.setText(NewEditorResourcesNLS.OverviewPage_ManagedBeanSection_table_classcol);
+				.setText(EditorMessages.OverviewPage_ManagedBeanSection_table_classcol);
 		tablelayout.addColumnData(new ColumnWeightData(1, true));
 		classcol.setResizable(true);
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
index 5556184d4..3b972148a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
@@ -31,7 +31,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
 import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
 import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
 import org.eclipse.swt.SWT;
@@ -63,8 +63,8 @@ public class OverviewNavigationSection extends AbstractOverviewSection {
 	public OverviewNavigationSection(Composite parent,
 			IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, PageflowEditor.PAGE_ID,
-				NewEditorResourcesNLS.OverviewPage_NavigationSection_name,
-				NewEditorResourcesNLS.OverviewPage_NavigationSection_description,
+				EditorMessages.OverviewPage_NavigationSection_name,
+				EditorMessages.OverviewPage_NavigationSection_description,
 				null, null);
 	}
 
@@ -157,7 +157,7 @@ public class OverviewNavigationSection extends AbstractOverviewSection {
 
 		TableColumn column1 = new TableColumn(table, SWT.LEFT);
 		column1
-				.setText(NewEditorResourcesNLS.OverviewPage_NavigationSection_table_col1);
+				.setText(EditorMessages.OverviewPage_NavigationSection_table_col1);
 		// column1.setWidth(COLUMN_WITH);
 		tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
 		// tablelayout.addColumnData(new ColumnWeightData(1, true));
@@ -165,7 +165,7 @@ public class OverviewNavigationSection extends AbstractOverviewSection {
 
 		TableColumn column2 = new TableColumn(table, SWT.LEFT);
 		column2
-				.setText(NewEditorResourcesNLS.OverviewPage_NavigationSection_table_col2);
+				.setText(EditorMessages.OverviewPage_NavigationSection_table_col2);
 		tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
 		// tablelayout.addColumnData(new ColumnWeightData(1, true));
 		column2.setResizable(true);
@@ -173,7 +173,7 @@ public class OverviewNavigationSection extends AbstractOverviewSection {
 
 		TableColumn column3 = new TableColumn(table, SWT.LEFT);
 		column3
-				.setText(NewEditorResourcesNLS.OverviewPage_NavigationSection_table_col3);
+				.setText(EditorMessages.OverviewPage_NavigationSection_table_col3);
 		tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
 		// tablelayout.addColumnData(new ColumnWeightData(1, true));
 		column3.setResizable(true);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
index 4492d2690..11ee5b278 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
@@ -30,7 +30,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
 import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
 import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
 import org.eclipse.swt.SWT;
@@ -61,8 +61,8 @@ public class OverviewOthersSection extends AbstractOverviewSection {
 	public OverviewOthersSection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, OthersPage.PAGE_ID,
-				NewEditorResourcesNLS.OverviewPage_OthersSection_name,
-				NewEditorResourcesNLS.OverviewPage_OthersSection_description,
+				EditorMessages.OverviewPage_OthersSection_name,
+				EditorMessages.OverviewPage_OthersSection_description,
 				null, null);
 	}
 
@@ -113,13 +113,13 @@ public class OverviewOthersSection extends AbstractOverviewSection {
 		TableColumn valuecol = new TableColumn(table, SWT.NONE);
 		tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
 		valuecol
-				.setText(NewEditorResourcesNLS.OverviewPage_OthersSection_table_valuecol);
+				.setText(EditorMessages.OverviewPage_OthersSection_table_valuecol);
 		valuecol.setResizable(true);
 
 		TableColumn typecol = new TableColumn(table, SWT.NONE);
 		tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
 		typecol
-				.setText(NewEditorResourcesNLS.OverviewPage_OthersSection_table_typecol);
+				.setText(EditorMessages.OverviewPage_OthersSection_table_typecol);
 		typecol.setResizable(true);
 
 		return table;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
index d53de2c4e..211731657 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
@@ -39,7 +39,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
 import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
 import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditPropertyDialog;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
@@ -77,9 +77,9 @@ public class PropertySection extends AbstractFacesConfigSection {
 	public PropertySection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
-		this.getSection().setText(NewEditorResourcesNLS.PropertySection_Name);
+		this.getSection().setText(EditorMessages.PropertySection_Name);
 		this.getSection().setDescription(
-				NewEditorResourcesNLS.PropertySection_Description);
+				EditorMessages.PropertySection_Description);
 
 	}
 
@@ -145,22 +145,22 @@ public class PropertySection extends AbstractFacesConfigSection {
 
 		TableColumn nameCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
-		nameCol.setText(NewEditorResourcesNLS.PropertySection_Table_NameColumn);//$NON-NLS-1$
+		nameCol.setText(EditorMessages.PropertySection_Table_NameColumn);//$NON-NLS-1$
 
 		TableColumn classCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		classCol
-				.setText(NewEditorResourcesNLS.PropertySection_Table_ClassColumn);
+				.setText(EditorMessages.PropertySection_Table_ClassColumn);
 
 		TableColumn valueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.PropertySection_Table_DefaultValueColumn);
+				.setText(EditorMessages.PropertySection_Table_DefaultValueColumn);
 
 		TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		suggestedValueCol
-				.setText(NewEditorResourcesNLS.PropertySection_Table_SuggestedValueColumn);
+				.setText(EditorMessages.PropertySection_Table_SuggestedValueColumn);
 
 		table.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -220,7 +220,7 @@ public class PropertySection extends AbstractFacesConfigSection {
 		operationContainer.setLayout(gl);
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -228,7 +228,7 @@ public class PropertySection extends AbstractFacesConfigSection {
 		addButton.setLayoutData(gd);
 
 		editButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -236,7 +236,7 @@ public class PropertySection extends AbstractFacesConfigSection {
 		editButton.setLayoutData(gd);
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
index 5425d33f7..16a114807 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
@@ -42,7 +42,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.RendererClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
 import org.eclipse.jst.jsf.facesconfig.emf.RendererTypeType;
 import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditRendererDialog;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.swt.SWT;
@@ -84,9 +84,9 @@ public class RendererSection extends AbstractFacesConfigSection {
 	public RendererSection(Composite parent, IManagedForm managedForm,
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
-		this.getSection().setText(NewEditorResourcesNLS.RendererSection_Name);
+		this.getSection().setText(EditorMessages.RendererSection_Name);
 		this.getSection().setDescription(
-				NewEditorResourcesNLS.RendererSection_Description);
+				EditorMessages.RendererSection_Description);
 
 	}
 
@@ -151,21 +151,21 @@ public class RendererSection extends AbstractFacesConfigSection {
 
 		TableColumn nameCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
-		nameCol.setText(NewEditorResourcesNLS.RendererSection_Table_NameColumn);
+		nameCol.setText(EditorMessages.RendererSection_Table_NameColumn);
 
 		TableColumn valueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		valueCol
-				.setText(NewEditorResourcesNLS.RendererSection_Table_ComponentFamilyColumn);
+				.setText(EditorMessages.RendererSection_Table_ComponentFamilyColumn);
 
 		TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
 		suggestedValueCol
-				.setText(NewEditorResourcesNLS.RendererSection_Table_TypeColumn);
+				.setText(EditorMessages.RendererSection_Table_TypeColumn);
 
 		TableColumn classCol = new TableColumn(table, SWT.NONE);
 		layout.addColumnData(new ColumnWeightData(1, true));
-		classCol.setText(NewEditorResourcesNLS.RendererSection_Table_ClassColumn);
+		classCol.setText(EditorMessages.RendererSection_Table_ClassColumn);
 
 		table.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -226,7 +226,7 @@ public class RendererSection extends AbstractFacesConfigSection {
 		operationContainer.setLayout(gl);
 
 		Button addButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Add_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Add_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -234,7 +234,7 @@ public class RendererSection extends AbstractFacesConfigSection {
 		addButton.setLayoutData(gd);
 
 		editButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Edit_more, //$NON-NLS-1$
+				EditorMessages.UI_Button_Edit_more, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
@@ -242,7 +242,7 @@ public class RendererSection extends AbstractFacesConfigSection {
 		editButton.setLayoutData(gd);
 
 		removeButton = toolkit.createButton(operationContainer,
-				NewEditorResourcesNLS.UI_Button_Remove, //$NON-NLS-1$
+				EditorMessages.UI_Button_Remove, //$NON-NLS-1$
 				SWT.PUSH);
 		gd = new GridData(GridData.FILL_HORIZONTAL
 				| GridData.VERTICAL_ALIGN_BEGINNING);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
index 2b3d0cfe2..ad090874a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
@@ -33,7 +33,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.RenderKitClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
 import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
 import org.eclipse.swt.layout.GridData;
@@ -69,9 +69,9 @@ public class RenderkitGeneralSection extends AbstractFacesConfigSection {
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
 		getSection()
-				.setText(NewEditorResourcesNLS.RenderKitGeneralSection_Name);
+				.setText(EditorMessages.RenderKitGeneralSection_Name);
 		getSection().setDescription(
-				NewEditorResourcesNLS.RenderKitGeneralSection_Description);
+				EditorMessages.RenderKitGeneralSection_Description);
 	}
 
 	/**
@@ -87,7 +87,7 @@ public class RenderkitGeneralSection extends AbstractFacesConfigSection {
 		toolkit.paintBordersFor(container);
 		displayNameField = new StringDialogField();
 		displayNameField
-				.setLabelText(NewEditorResourcesNLS.RenderKitGeneralSection_Label_DisplayName);
+				.setLabelText(EditorMessages.RenderKitGeneralSection_Label_DisplayName);
 		displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		displayNameField
@@ -127,7 +127,7 @@ public class RenderkitGeneralSection extends AbstractFacesConfigSection {
 
 		descriptionField = new StringDialogField(2);
 		descriptionField
-				.setLabelText(NewEditorResourcesNLS.RenderKitGeneralSection_Label_Description);
+				.setLabelText(EditorMessages.RenderKitGeneralSection_Label_Description);
 		descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		descriptionField
@@ -168,7 +168,7 @@ public class RenderkitGeneralSection extends AbstractFacesConfigSection {
 		renderkitIdField = new StringDialogField();
 		// renderkitIdField.setRequired(true);
 		renderkitIdField
-				.setLabelText(NewEditorResourcesNLS.RenderKitGeneralSection_Label_RenderKitID);
+				.setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitID);
 		renderkitIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		renderkitIdField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
@@ -195,7 +195,7 @@ public class RenderkitGeneralSection extends AbstractFacesConfigSection {
 		renderkitClassField = new ClassButtonDialogField(null);
 		// renderkitClassField.setRequired(true);
 		renderkitClassField
-				.setLabelText(NewEditorResourcesNLS.RenderKitGeneralSection_Label_RenderKitClass);
+				.setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitClass);
 		renderkitClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		renderkitClassField.setProject((IProject) getPage().getEditor()
 				.getAdapter(IProject.class));
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
index df50db8c6..7da706b10 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -46,9 +46,9 @@ public class RenderkitMasterSection extends FacesConfigMasterSection {
 	public RenderkitMasterSection(Composite parent, IManagedForm managedForm,
 			FormToolkit toolkit, FacesConfigMasterDetailPage page) {
 		super(parent, managedForm, toolkit, page, null, null);
-		getSection().setText(NewEditorResourcesNLS.RenderKitMasterSection_Name); //$NON-NLS-1$
+		getSection().setText(EditorMessages.RenderKitMasterSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.RenderKitMasterSection_Description);
+				EditorMessages.RenderKitMasterSection_Description);
 	}
 
 	/**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
index eb616b007..e32601453 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
@@ -33,7 +33,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ValidatorClassType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
 import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
 import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
 import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
 import org.eclipse.swt.layout.GridData;
@@ -69,9 +69,9 @@ public class ValidatorGeneralSection extends AbstractFacesConfigSection {
 			IFacesConfigPage page, FormToolkit toolkit) {
 		super(parent, managedForm, page, toolkit, null, null);
 		getSection()
-				.setText(NewEditorResourcesNLS.ValidatorGeneralSection_Name);
+				.setText(EditorMessages.ValidatorGeneralSection_Name);
 		getSection().setDescription(
-				NewEditorResourcesNLS.ValidatorGeneralSection_Description);
+				EditorMessages.ValidatorGeneralSection_Description);
 	}
 
 	/**
@@ -87,7 +87,7 @@ public class ValidatorGeneralSection extends AbstractFacesConfigSection {
 		toolkit.paintBordersFor(container);
 		displayNameField = new StringDialogField();
 		displayNameField
-				.setLabelText(NewEditorResourcesNLS.ValidatorGeneralSection_Label_DisplayName);
+				.setLabelText(EditorMessages.ValidatorGeneralSection_Label_DisplayName);
 		displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		displayNameField
@@ -127,7 +127,7 @@ public class ValidatorGeneralSection extends AbstractFacesConfigSection {
 
 		descriptionField = new StringDialogField(2);
 		descriptionField
-				.setLabelText(NewEditorResourcesNLS.ValidatorGeneralSection_Label_Description);
+				.setLabelText(EditorMessages.ValidatorGeneralSection_Label_Description);
 		descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
 
 		descriptionField
@@ -168,7 +168,7 @@ public class ValidatorGeneralSection extends AbstractFacesConfigSection {
 		validatorIDField = new StringDialogField();
 		// validatorIDField.setRequired(true);
 		validatorIDField
-				.setLabelText(NewEditorResourcesNLS.ValidatorGeneralSection_Label_ValidatorID);
+				.setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorID);
 		validatorIDField.doFillIntoGrid(toolkit, container, numberOfColumns);
 		validatorIDField
 				.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
@@ -196,7 +196,7 @@ public class ValidatorGeneralSection extends AbstractFacesConfigSection {
 		validatorClassField = new ClassButtonDialogField(null);
 		// validatorClassField.setRequired(true);
 		validatorClassField
-				.setLabelText(NewEditorResourcesNLS.ValidatorGeneralSection_Label_ValidatorClass);
+				.setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorClass);
 		validatorClassField.setProject((IProject) getPage().getEditor()
 				.getAdapter(IProject.class));
 		validatorClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
index 11373d473..135367387 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
 import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.jsf.facesconfig.ui.NewEditorResourcesNLS;
+import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
 import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Composite;
@@ -46,9 +46,9 @@ public class ValidatorMasterSection extends FacesConfigMasterSection {
 	public ValidatorMasterSection(Composite parent, IManagedForm managedForm,
 			FormToolkit toolkit, FacesConfigMasterDetailPage page) {
 		super(parent, managedForm, toolkit, page, null, null);
-		getSection().setText(NewEditorResourcesNLS.ValidatorMasterSection_Name); //$NON-NLS-1$
+		getSection().setText(EditorMessages.ValidatorMasterSection_Name); //$NON-NLS-1$
 		getSection().setDescription(
-				NewEditorResourcesNLS.ValidatorMasterSection_Description);
+				EditorMessages.ValidatorMasterSection_Description);
 	}
 
 	/**