diff --git a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
index c370a71fb39..407a07bd7b4 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.ssh/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.rse.internal.services.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.rse.services;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.rse.services;bundle-version="[3.1.0,4.0.0)",
  com.jcraft.jsch;bundle-version="[0.1.31,1.0.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.services/.settings/.api_filters b/rse/plugins/org.eclipse.rse.services/.settings/.api_filters
index d5ba5d98bcd..c6225b042b4 100644
--- a/rse/plugins/org.eclipse.rse.services/.settings/.api_filters
+++ b/rse/plugins/org.eclipse.rse.services/.settings/.api_filters
@@ -1,10 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.rse.services" version="2">
-<resource path="src/org/eclipse/rse/internal/services/terminals/ProcessBaseShell.java" type="org.eclipse.rse.internal.services.terminals.ProcessBaseShell">
-<filter id="337682486">
-<message_arguments>
-<message_argument value="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"/>
-</message_arguments>
-</filter>
-</resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalShell">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalShell"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalService">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalService"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.ITerminalService">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.ITerminalService"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.AbstractTerminalShell"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.BaseShellDecorator">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.BaseShellDecorator"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.TerminalShellDecorator"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.rse.internal.services.terminals.IBaseShell">
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.IBaseShell"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/rse/internal/services/terminals/ProcessBaseShell.java" type="org.eclipse.rse.internal.services.terminals.ProcessBaseShell">
+        <filter id="305365105">
+            <message_arguments>
+                <message_argument value="org.eclipse.rse.internal.services.terminals.ProcessBaseShell"/>
+                <message_argument value="org.eclipse.rse.services_3.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
index 5ed470f15cf..051683d790f 100644
--- a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.rse.internal.services;x-internal:=true,
  org.eclipse.rse.internal.services.clientserver.archiveutils;x-internal:=true,
  org.eclipse.rse.internal.services.clientserver.java;x-internal:=true,
  org.eclipse.rse.internal.services.shells;x-internal:=true,
- org.eclipse.rse.internal.services.terminals,
+ org.eclipse.rse.internal.services.terminals;x-internal:=true,
  org.eclipse.rse.services,
  org.eclipse.rse.services.clientserver,
  org.eclipse.rse.services.clientserver.archiveutils,