diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 6ccd4f07db4..3ce9d324926 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -46,7 +46,7 @@
 
 <table border="0" cellspacing="5" cellpadding="2" width="100%">
 	<tr>
-		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#0080C0"><b>
+		<td align="LEFT" valign="TOP" colspan="3" bgcolor="#808080"><b>
 		<font face="Arial,Helvetica" color="#FFFFFF">API Changes since RSE 1.0 M4</font></b></td>
 	</tr>
 </table>
@@ -56,6 +56,10 @@
   <a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html">
   subsystemConfigurations</a> 
   in order to better match the standard naming scheme used by the Platform.</li>
+<li>The <b>newConnectionWizardDelegate</b> extension point has been renamed to 
+  <a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_ui_newConnectionWizardDelegates.html">
+  newConnectionWizardDelegates</a> 
+  in order to better match the standard naming scheme used by the Platform.</li>
 </ul>
 </td></tr></tbody></table>
 
diff --git a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
index 84ef8cee329..2707576d394 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
+++ b/rse/doc/org.eclipse.rse.doc.isv/reference/extension-points/index.html
@@ -19,7 +19,7 @@
   <li><a href="org_eclipse_rse_ui_dynamicPopupMenuExtensions.html">org.eclipse.rse.ui.dynamicPopupMenuExtensions</a></li>
   <li><a href="org_eclipse_rse_ui_keystoreProviders.html">org.eclipse.rse.ui.keystoreProviders</a></li>
   <li><a href="org_eclipse_rse_ui_mountPathMappers.html">org.eclipse.rse.ui.mountPathMappers</a></li>
-  <li><a href="org_eclipse_rse_ui_newConnectionWizardDelegate.html">org.eclipse.rse.ui.newConnectionWizardDelegate</a></li>
+  <li><a href="org_eclipse_rse_ui_newConnectionWizardDelegates.html">org.eclipse.rse.ui.newConnectionWizardDelegates</a></li>
   <li><a href="org_eclipse_rse_ui_passwordPersistence.html">org.eclipse.rse.ui.passwordPersistence</a></li>
   <li><a href="org_eclipse_rse_ui_persistenceProviders.html">org.eclipse.rse.ui.persistenceProviders</a></li>
   <li><a href="org_eclipse_rse_ui_popupMenus.html">org.eclipse.rse.ui.popupMenus</a></li>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
index 21367a0036c..50f71f9f3bc 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
+++ b/rse/doc/org.eclipse.rse.doc.isv/topics_Reference.xml
@@ -14,7 +14,7 @@
 		<topic label="org.eclipse.rse.ui.dynamicPopupMenuExtensions" href="reference/extension-points/org_eclipse_rse_ui_dynamicPopupMenuExtensions.html" />
 		<topic label="org.eclipse.rse.ui.keystoreProviders" href="reference/extension-points/org_eclipse_rse_ui_keystoreProviders.html" />
 		<topic label="org.eclipse.rse.ui.mountPathMappers" href="reference/extension-points/org_eclipse_rse_ui_mountPathMappers.html" />
-		<topic label="org.eclipse.rse.ui.newConnectionWizardDelegate" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizardDelegate.html" />
+		<topic label="org.eclipse.rse.ui.newConnectionWizardDelegates" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizardDelegates.html" />
 		<topic label="org.eclipse.rse.ui.passwordPersistence" href="reference/extension-points/org_eclipse_rse_ui_passwordPersistence.html" />
 		<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension-points/org_eclipse_rse_ui_persistenceProviders.html" />
 		<topic label="org.eclipse.rse.ui.popupMenus" href="reference/extension-points/org_eclipse_rse_ui_popupMenus.html" />
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
index be31bc032e3..0907a973c33 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
@@ -21,10 +21,10 @@ import org.eclipse.ui.INewWizard;
 
 public interface IRSENewConnectionWizard extends INewWizard {
 
-	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_POINT_ID = "org.eclipse.rse.ui.newConnectionWizardDelegate";
-	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_NAME = "newConnectionWizardDelegate";
-	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_SYSTEMTYPE = "systemType";
-	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_CLASS = "class";
+	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_POINT_ID = "org.eclipse.rse.ui.newConnectionWizardDelegates"; //$NON-NLS-1$
+	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_NAME = "newConnectionWizardDelegate"; //$NON-NLS-1$
+	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_SYSTEMTYPE = "systemType"; //$NON-NLS-1$
+	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
 	
 	public IRSENewConnectionWizardDelegate getDelegate();
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 0cfdd36d2d9..7f974b07cf5 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -404,7 +404,7 @@ Contributors:
 <!--																					-->
 <!-- See the extension point reference for more details.								-->
 	
-	<extension-point id="remoteSystemsViewPreferencesActions" name="%extPoint.remoteSystemsViewPreferencesActions" schema="schema/remoteSystemsViewPreferencesAction.exsd"/>
+	<extension-point id="remoteSystemsViewPreferencesActions" name="%extPoint.remoteSystemsViewPreferencesActions" schema="schema/remoteSystemsViewPreferencesActions.exsd"/>
 	
 <!-- ================================================================================== -->
 <!-- EXTENSION POINT: org.eclipse.rse.ui.showNewConnectionPrompt               -->
@@ -777,7 +777,7 @@ Contributors:
 <!-- 		Define Persistence Provider extension point -->
 <!-- ================================================================= -->
    <extension-point id="persistenceProviders" name="%extPoint.persistenceProviders" schema="schema/persistenceProviders.exsd"/>
-   <extension-point id="newConnectionWizardDelegate" name="RSE New Connection Wizard Delegate" schema="schema/newConnectionWizardDelegate.exsd"/>
+   <extension-point id="newConnectionWizardDelegates" name="RSE New Connection Wizard Delegate" schema="schema/newConnectionWizardDelegates.exsd"/>
 
 
 
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
similarity index 98%
rename from rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd
rename to rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
index 667c76387c3..aecd0d1a0d4 100644
--- a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegate.exsd
+++ b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
@@ -3,7 +3,7 @@
 <schema targetNamespace="org.eclipse.rse.ui">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.rse.ui" id="newConnectionWizardDelegate" name="RSE New Connection Wizard Delegate"/>
+         <meta.schema plugin="org.eclipse.rse.ui" id="newConnectionWizardDelegates" name="RSE New Connection Wizard Delegate"/>
       </appInfo>
       <documentation>
          This extension point allows a New Connection wizard delegate to be provided for a certain system type. This is useful for those system types that need New Connection wizard pages which are different from the default pages supplied by RSE.
@@ -92,7 +92,7 @@
 
 &lt;p&gt;
 &lt;pre&gt;
-	&lt;extension point=&quot;org.eclipse.rse.ui.newConnectionWizardDelegate&quot;&gt;
+	&lt;extension point=&quot;org.eclipse.rse.ui.newConnectionWizardDelegates&quot;&gt;
 		&lt;newConnectionWizardDelegate
 			class=&quot;com.abc.SerialConnectionWizardDelegate&quot;
 			systemType=&quot;Embedded-Linux-Serial&quot;/&gt;
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd b/rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesActions.exsd
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesAction.exsd
rename to rse/plugins/org.eclipse.rse.ui/schema/remoteSystemsViewPreferencesActions.exsd