diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml
index 9556c9487a1..f19854ee0b9 100644
--- a/discovery/org.eclipse.rse.discovery/plugin.xml
+++ b/discovery/org.eclipse.rse.discovery/plugin.xml
@@ -14,7 +14,7 @@ Contributors:
 <plugin>
 
     <extension
-          point="org.eclipse.rse.ui.newConnectionWizard">
+          point="org.eclipse.rse.ui.newConnectionWizards">
        <newConnectionWizard
              canFinishEarly="false"
              categoryId="org.eclipse.rse.ui.wizards.newconnection.default.category"
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 d22ee504741..d368231d0bd 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_newConnectionWizardDelegates.html">org.eclipse.rse.ui.newConnectionWizardDelegates</a></li>
+  <li><a href="org_eclipse_rse_ui_newConnectionWizards.html">org.eclipse.rse.ui.newConnectionWizards</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_remoteSystemsViewPreferencesActions.html">org.eclipse.rse.ui.remoteSystemsViewPreferencesActions</a></li>
   <li><a href="org_eclipse_rse_ui_subsystemConfigurations.html">org.eclipse.rse.ui.subsystemConfigurations</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 ebc9a923ba6..7fb2c51c105 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.newConnectionWizardDelegates" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizardDelegates.html" />
+		<topic label="org.eclipse.rse.ui.newConnectionWizards" href="reference/extension-points/org_eclipse_rse_ui_newConnectionWizards.html" />
 		<topic label="org.eclipse.rse.ui.persistenceProviders" href="reference/extension-points/org_eclipse_rse_ui_persistenceProviders.html" />
 		<topic label="org.eclipse.rse.ui.remoteSystemsViewPreferencesActions" href="reference/extension-points/org_eclipse_rse_ui_remoteSystemsViewPreferencesActions.html" />
 		<topic label="org.eclipse.rse.ui.subsystemConfigurations" href="reference/extension-points/org_eclipse_rse_ui_subsystemConfigurations.html" />
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
index 10de0e0c5fc..48e99fae29c 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/newconnection/RSENewConnectionWizardRegistry.java
@@ -63,7 +63,7 @@ public class RSENewConnectionWizardRegistry extends RSEAbstractWizardRegistry {
 	 * @see org.eclipse.rse.ui.wizards.registries.RSEAbstractWizardRegistry#getExtensionPointId()
 	 */
 	protected String getExtensionPointId() {
-		return RSEUIPlugin.getDefault().getBundle().getSymbolicName() + ".newConnectionWizard"; //$NON-NLS-1$
+		return RSEUIPlugin.getDefault().getBundle().getSymbolicName() + ".newConnectionWizards"; //$NON-NLS-1$
 	}
 	
 	/**
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 38bf1b39992..cd51944a146 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -484,7 +484,7 @@ Contributors:
 <!-- ================================================================= -->
    <extension-point id="keystoreProviders" name="%extPoint.keystoreProviders" schema="schema/keystoreProviders.exsd"/>
 
-   <extension-point id="newConnectionWizard" name="%extPoint.newConnectionWizard" schema="schema/newConnectionWizard.exsd"/>
+   <extension-point id="newConnectionWizards" name="%extPoint.newConnectionWizard" schema="schema/newConnectionWizards.exsd"/>
 
 
 <!-- ================================================================= -->
@@ -605,7 +605,7 @@ Contributors:
         </decorator>
      </extension>
   <extension
-        point="org.eclipse.rse.ui.newConnectionWizard">
+        point="org.eclipse.rse.ui.newConnectionWizards">
 		<category id="org.eclipse.rse.ui.wizards.newconnection.default.category"
 				name="%Creation.category.name"/>
 		<newConnectionWizard
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizard.exsd b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd
similarity index 100%
rename from rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizard.exsd
rename to rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd