diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
index b2d609f..0bff385 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/util/EJBUIMessages.java
@@ -67,6 +67,7 @@
 	public static String STATE_TYPE_LABEL;
 	public static String CREATE_BUSINESS_INTERFACE;
 	public static String REMOTE_BUSINESS_INTERFACE;
+	public static String REMOTE_BUSINESS_INTERFACE_E;
 	public static String REMOTE_BUSINESS_INTERFACE_LABEL;
 	public static String REMOTE_HOME_INTERFACE_LABEL;
 	public static String LOCAL_BUSINESS_INTERFACE;
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java
index bc1d8c2..6b6c2cd 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddMessageDrivenBeanWizardPage.java
@@ -28,7 +28,6 @@
 import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
 import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -93,9 +92,7 @@
 				if (value == null || value.trim().length() == 0) {
 					value = IEjbWizardConstants.CLICK_TO_SELECT;
 				}
-				messageListenerInterfaceHyperlink.setText(NLS.bind(
-						IEjbWizardConstants.MESSAGE_LISTENER_INTERFACE_HYPERLINK,
-						value));
+				messageListenerInterfaceHyperlink.setText(value);
 			}
 		}
 
@@ -168,10 +165,9 @@
 	}
 
 	private void createMessageListenerInterfaceControl(Composite composite) {
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalSpan = 2;
+		Label messageListenerInterfaceLabel = new Label(composite, SWT.LEFT);
+		messageListenerInterfaceLabel.setText(EJBUIMessages.MESSAGE_LISTENER_INTERFACE_HYPERLINK);
 		messageListenerInterfaceHyperlink = new Hyperlink(composite, SWT.NULL);
-		messageListenerInterfaceHyperlink.setLayoutData(data);
 		messageListenerInterfaceHyperlink.setToolTipText(IEjbWizardConstants.MESSAGE_LISTENER_INTERFACE_HYPERLINK_TOOLTIP);
 		messageListenerInterfaceHyperlink.setVisible(true);
 		messageListenerInterfaceHyperlink.setUnderlined(true);
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddSessionBeanWizardPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddSessionBeanWizardPage.java
index 5e84e6a..943bbd2 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddSessionBeanWizardPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/AddSessionBeanWizardPage.java
@@ -161,7 +161,7 @@
 		});
 
 		final Button remote2xCheck = new Button(othersComposite, SWT.CHECK);
-		remote2xCheck.setText(EJBUIMessages.REMOTE_BUSINESS_INTERFACE);
+		remote2xCheck.setText(EJBUIMessages.REMOTE_BUSINESS_INTERFACE_E);
 
 		synchHelper.synchCheckbox(remote2xCheck, REMOTE_HOME, null);
 
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java
index 949a934..a9166a2 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBComponentImportPage.java
@@ -12,6 +12,7 @@
 
 import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
 import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
+import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
 import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
@@ -55,7 +56,7 @@
 
 	@Override
 	protected String getProjectImportLabel() {
-		return EJBUIMessages.EJB_PROJECT_LBL;
+		return J2EEUIMessages.getResourceString(J2EEUIMessages.EJB_PROJ_LBL);
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
index d9688bc..47d07d0 100644
--- a/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
+++ b/plugins/org.eclipse.jst.ejb.ui/ejb_ui/org/eclipse/jst/ejb/ui/internal/wizard/EJBExportPage.java
@@ -19,7 +19,6 @@
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jst.ejb.ui.internal.util.EJBUIMessages;
 import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
 import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
@@ -52,7 +51,7 @@
 	 */
 	@Override
 	protected String getComponentLabel() {
-		return J2EEUIMessages.getResourceString(J2EEUIMessages.EJB_PROJ_LBL);
+		return EJBUIMessages.EJB_PROJECT_LBL;
 	}
 
 	/*
diff --git a/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties b/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
index 92c9160..9079172 100644
--- a/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
+++ b/plugins/org.eclipse.jst.ejb.ui/property_files/ejb_ui.properties
@@ -15,8 +15,8 @@
 KEY_4=Create an EJB Project and add it to a new or existing Enterprise Application.
 KEY_5=Import an EJB jar from the file system
 KEY_6=EJB Jar Import
-KEY_7=EJB Jar file:
-KEY_8=EJB project:
+KEY_7=EJB JAR fi&le:
+KEY_8=EJB &project:
 KEY_9=EJB Jar Export
 KEY_10=Export EJB project to the local file system.
 KEY_11=EJB client JAR Creation
@@ -49,13 +49,14 @@
 NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
 ADD_SESSION_BEAN_WIZARD_PAGE_DESC=Enter Session Bean specific information.
 
-STATE_TYPE_LABEL=State type:
+STATE_TYPE_LABEL=State &type:
 CREATE_BUSINESS_INTERFACE=Create business interface
-HOMECOMPONENTINTERFACE=Home and &Component interfaces (EJB 2.x)
-REMOTE_BUSINESS_INTERFACE=Remote
+HOMECOMPONENTINTERFACE=H&ome and Component interfaces (EJB 2.x)
+REMOTE_BUSINESS_INTERFACE=&Remote
+REMOTE_BUSINESS_INTERFACE_E=R&emote
 REMOTE_BUSINESS_INTERFACE_LABEL=Remote Business Interface:
 REMOTE_HOME_INTERFACE_LABEL=Remote Home Interface:
-LOCAL_BUSINESS_INTERFACE=Local
+LOCAL_BUSINESS_INTERFACE=&Local
 LOCAL_BUSINESS_INTERFACE_LABEL=Local Business Interface:
 LOCAL_HOME_INTERFACE_LABEL=Local Home Interface:
 LOCAL_COMPONENT_INTERFACE_CODE=L
@@ -66,27 +67,27 @@
 LOCAL_HOME_INTERFACE_TOOLTIP=Local Home interface
 REMOTE_COMPONENT_INTERFACE_TOOLTIP=Remote Component interface
 REMOTE_HOME_INTERFACE_TOOLTIP=Remote Home interface
-EJB_NAME=Bean name:
+EJB_NAME=Bean na&me:
 TRANSACTION_TYPE_CONTAINER=Container
 TRANSACTION_TYPE_BEAN=Bean
 STATE_TYPE_STATELESS=Stateless
 STATE_TYPE_STATEFUL=Stateful
 chooseInterface=Choose Interface
 addAs=Add as:
-MAPPED_NAME=Mapped name:
-TRANSACTION_TYPE=Transaction type:
+MAPPED_NAME=Ma&pped name:
+TRANSACTION_TYPE=&Transaction type:
 BUSSINESS_INTERFACE=Business interfaces:
 ADD_INTERFACES=Add...
 REMOVE_INTERFACES=Remove
 ADD_SESSION_BEAN_WIZARD_PAGE_TITLE=Create EJB 3.x Session Bean
 ADD_MESSAGE_DRIVEN_BEAN_WIZARD_PAGE_TITLE=Create EJB 3.x Message-Driven Bean
 ADD_MESSAGE_DRIVEN_BEAN_WIZARD_PAGE_DESC=Enter Message-Driven Bean specific information.
-DESTINATION_LABEL=Destination type:
+DESTINATION_LABEL=Destination &type:
 DESTINATION_TYPE_QUEUE=Queue
 DESTINATION_TYPE_TOPIC=Topic
-JMS=JMS
-DESTINATION_NAME_LABEL=Destination name:
-MESSAGE_LISTENER_INTERFACE_HYPERLINK=Message listener interface: {0}
+JMS=&JMS
+DESTINATION_NAME_LABEL=Destination n&ame:
+MESSAGE_LISTENER_INTERFACE_HYPERLINK=Message &listener: 
 MESSAGE_LISTENER_INTERFACE_HYPERLINK_TOOLTIP=Set message listener interface
 CLICK_TO_SELECT=<click to select>
 EJB_CLIENT_JAR_GROUP=EJB Client JAR
\ No newline at end of file