diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index a4c2d17acaa..a679b9a490e 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -691,9 +691,9 @@ Contributors:
             id="org.eclipse.rse.SystemProfilePropertyPage">
       </page>
       <page
-            objectClass="org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemFactoryNode"
+            objectClass="org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode"
             name="%PropertyPage.TeamViewSubSystemFactoryNode"
-            class="org.eclipse.rse.ui.propertypages.SystemTeamViewSubSystemFactoryPropertyPage"
+            class="org.eclipse.rse.ui.propertypages.SystemTeamViewSubSystemConfigurationPropertyPage"
             id="org.eclipse.rse.SystemTeamViewSubSystemFactoryPropertyPage">
       </page>
       
@@ -1023,14 +1023,16 @@ Contributors:
 	<extension point="org.eclipse.ui.newWizards">
 		<category id="org.eclipse.rse.ui.newWizards.rseCategory"
 				name="%Creation.category.name"/>
-		<wizard id="org.eclipse.rse.ui.newWizards.connection"
-				name="%Creation.connection.name"
-				icon="icons/full/etool16/newconnection_wiz.gif"
-				category="org.eclipse.rse.ui.newWizards.rseCategory"
-				class="org.eclipse.rse.ui.wizards.RSENewConnectionWizard"
-				preferredPerspectives="org.eclipse.rse.ui.view.SystemPerspective"
-				canFinishEarly="false"
-				hasPages="true">
+		<wizard
+        canFinishEarly="false"
+        category="org.eclipse.rse.ui.newWizards.rseCategory"
+        class="org.eclipse.rse.ui.wizards.RSENewConnectionWizard"
+        finalPerspective="org.eclipse.rse.ui.view.SystemPerspective"
+        hasPages="true"
+        icon="icons/full/etool16/newconnection_wiz.gif"
+        id="org.eclipse.rse.ui.newWizards.connection"
+        name="%Creation.connection.name"
+        preferredPerspectives="org.eclipse.rse.ui.view.SystemPerspective">
 			<description>
 				%Creation.connection.description
 			</description>