diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
index 6e4007523b7..2f8514345a8 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
@@ -24,7 +24,7 @@ Martin Oberhuber (Wind River) - initial API and implementation
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypes="Daytime"
+			systemTypeIds="org.eclipse.rse.examples.daytime.systemtype"
 			name="%Files"
 			description="%FilesDescription"
 			iconlive="icons/full/obj16/systemfileslive_obj.gif"
@@ -41,7 +41,7 @@ Martin Oberhuber (Wind River) - initial API and implementation
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypes="Daytime;Unix"
+			systemTypeIds="org.eclipse.rse.examples.daytime.systemtype;org.eclipse.rse.systemtype.unix"
 			name="%DaytimeSubsystemName"
 			description="%DaytimeDescription"
 			iconlive="icons/full/obj16/daytimelive_obj.gif"
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml
index 5c1263ee1a3..ad568f080aa 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.xml
@@ -62,7 +62,7 @@ Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
 			id="samples.subsystems.factory"
-			systemTypes="Linux;Unix;Windows"
+			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows"
 			name="Teams"
 			class="samples.subsystems.DeveloperSubSystemConfiguration"
 			category="users"
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
index b92020a9661..442f5b1a417 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.processes.ui/plugin.xml
@@ -24,7 +24,7 @@ Contributors:
       <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <factory
-            systemTypes="Local"
+            systemTypeIds="org.eclipse.rse.systemtype.local"
             name="%Factory.LocalProcesses"
             iconlive="icons/full/obj16/activeprocess.gif"
             icon="icons/full/obj16/activeprocess.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
index 3f3124184c8..4ed8eb73c08 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.xml
@@ -21,7 +21,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Linux;Unix"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
             name="%Files"
             description="%FilesDescription"
             iconlive="icons/full/obj16/systemfileslive_obj.gif"
@@ -34,7 +34,7 @@ Contributors:
       </configuration>
 
       <configuration 
-            systemTypes="Windows"
+            systemTypeIds="org.eclipse.rse.systemtype.windows"
             name="%Files"
             description="%FilesDescription"
             iconlive="icons/full/obj16/systemfileslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
index 06f79d2670d..c3713fdab52 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.xml
@@ -27,7 +27,7 @@ Martin Oberhuber (Wind River) - add FTP Only system type
 	</extension>
     <extension point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Linux;Unix;Windows;FTP Only"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows;org.eclipse.rse.systemtype.ftp"
             name="%Files"
             description="%FilesDescription"
             iconlive="icons/full/obj16/systemfileslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml
index f3f72c758cd..589b1036117 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.xml
@@ -21,7 +21,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Local"
+            systemTypeIds="org.eclipse.rse.systemtype.local"
             name="%Files"
             description="%FilesDescription"
             iconlive="icons/full/obj16/systemfileslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
index 116f0d593ba..70108e9a08d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/plugin.xml
@@ -14,7 +14,7 @@ Martin Oberhuber - initial API and implementation
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypes="Linux;Unix;AIX;SSH Only"
+			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
 			name="%SshFileSubsystemName"
 			description="%SshFileSubsystemDescription"
 			iconlive="icons/full/obj16/systemfileslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
index 2609b2e84f3..e7ffee75dff 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.xml
@@ -25,7 +25,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Linux;Unix"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix"
             name="%Processes"
             description="%ProcessesDescription"
             iconlive="icons/full/obj16/processsubsystemlive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml
index e22c10b3a06..b58398d5d0c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.xml
@@ -26,7 +26,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.core.subsystemfactory">
       <factory
-            systemTypes="Local"
+            systemTypeIds="org.eclipse.rse.systemtype.local"
             name="Local Processes (new)"
             iconlive="icons/full/obj16/processsubsystemlive_obj.gif"
             icon="icons/full/obj16/processsubsystem_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
index b010ab7006f..a6620801dca 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.xml
@@ -22,7 +22,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Linux;Unix;Windows"
+            systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows"
             name="%Shells"
             description="%ShellsDescription"
             iconlive="icons/full/obj16/systemcommandslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml
index f03bd883c0a..f9c3e1e5eb9 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.xml
@@ -25,7 +25,7 @@ Contributors:
    <extension
          point="org.eclipse.rse.ui.subsystemConfigurations">
       <configuration
-            systemTypes="Local"
+            systemTypeIds="org.eclipse.rse.systemtype.local"
             name="%Shells"
             description="%ShellsDescription"
             iconlive="icons/full/obj16/systemcommandslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
index 04eb20a8878..1efbf740cc3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/plugin.xml
@@ -14,7 +14,7 @@ Martin Oberhuber - initial API and implementation
 	<extension
 		point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
-			systemTypes="Linux;Unix;AIX;SSH Only"
+			systemTypeIds="org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.aix;org.eclipse.rse.systemtype.ssh"
 			name="%SshShellSubsystemName"
 			description="%SshShellSubsystemDescription"
 			iconlive="icons/full/obj16/systemcommandslive_obj.gif"
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 67cce0b457e..113909dbc2f 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -27,7 +27,7 @@ Contributors:
 <!--   <extension                                                                       -->
 <!--      point="org.eclipse.rse.ui.subsystemConfigurations">                            -->
 <!--      <configuration                                                                -->
-<!--         systemTypes="Local;Unix;Linux"                                             -->
+<!--         systemTypeIds="org.eclipse.rse.systemtype.local;org.eclipse.rse.systemtype.unix"-->
 <!--         name="Files"                                                               -->
 <!--         description="This subsystem allows you to work with files on local or remote systems."-->
 <!--         icon="icons/filesubsys.gif"                                                -->
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd
index d7c14fd5605..325b66072a6 100644
--- a/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd
+++ b/rse/plugins/org.eclipse.rse.ui/schema/subsystemConfigurations.exsd
@@ -137,7 +137,12 @@ These appear in configuration and properties pages for subsystems.
                <documentation>
                   A semicolon separated list of system type names that subsystems from this configuration support. For example, &quot;Unix;Linux&quot;.
 If not specified and the &quot;systemTypeIds&quot; attribute is not specified, defaults to all system types. The wildcards &apos;*&apos; and &apos;?&apos; are accepted.
+&lt;p&gt;
+&lt;b&gt;Deprecated:&lt;/b&gt; Use the systemTypeIds attribute instead.
                </documentation>
+               <appInfo>
+                  <meta.attribute deprecated="true"/>
+               </appInfo>
             </annotation>
          </attribute>
          <attribute name="systemTypeIds" type="string">
diff --git a/rse/tests/org.eclipse.rse.tests/plugin.xml b/rse/tests/org.eclipse.rse.tests/plugin.xml
index 7ff0c5dacc1..a835e5a81b3 100644
--- a/rse/tests/org.eclipse.rse.tests/plugin.xml
+++ b/rse/tests/org.eclipse.rse.tests/plugin.xml
@@ -15,6 +15,7 @@
       	<type name="org.eclipse.rse.tests.subsystems.files.RSEFileSubsystemTestSuite" class="org.eclipse.rse.tests.subsystems.files.RSEFileSubsystemTestSuite" />
    </extension>
 
+	<!-- Do not replace the use of systemTypes here as long it only deprecated! -->
 	<extension point="org.eclipse.rse.ui.subsystemConfigurations">
 		<configuration
 			id="org.eclipse.rse.tests.subsystems.TestSubSystem"
@@ -42,6 +43,7 @@
 			priority="100000">
 		</configuration>
 
+		<!-- Do not replace the use of systemTypes here as long it only deprecated! -->
 		<configuration
 			id="org.eclipse.rse.tests.subsystems.TestSubSystem3"
 			systemTypes="*n?x"