diff --git a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
index a3e37bad4e9..365f779ba21 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
+++ b/rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
@@ -44,7 +44,7 @@ import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.IService;
 import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.shells.HostShellAdapter;
+import org.eclipse.rse.services.shells.HostShellProcessAdapter;
 import org.eclipse.rse.services.shells.IHostShell;
 import org.eclipse.rse.services.shells.IShellService;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
@@ -277,7 +277,7 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
 		
 		Process p = null;
 		try {
-			p = new HostShellAdapter(hostShell);
+			p = new HostShellProcessAdapter(hostShell);
 		} catch (Exception e) {
 			if (p != null) {
 				p.destroy();
diff --git a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellAdapter.java b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellProcessAdapter.java
similarity index 94%
rename from rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellAdapter.java
rename to rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellProcessAdapter.java
index bc0b1e8e0e1..0b7576f86a1 100644
--- a/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellAdapter.java
+++ b/rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellProcessAdapter.java
@@ -9,6 +9,7 @@
  * Ewa Matejska (PalmSource) - initial version
  * Martin Oberhuber (Wind River) - adapt to IHostOutput API (bug 161773, 158312)
  * Martin Oberhuber (Wind River) - moved from org.eclipse.rse.remotecdt (bug 161777)
+ * Martin Oberhuber (Wind River) - renamed from HostShellAdapter (bug 161777)
  *******************************************************************************/
 
 package org.eclipse.rse.services.shells;
@@ -28,7 +29,7 @@ import java.io.PipedOutputStream;
  * @author Ewa Matejska
  *
  */
-public class HostShellAdapter extends Process implements
+public class HostShellProcessAdapter extends Process implements
 IHostShellOutputListener {
 
 	private IHostShell hostShell;
@@ -44,7 +45,7 @@ IHostShellOutputListener {
 	 * @param hostShell  An instance of the IHostShell class.
 	 * @throws java.io.IOException
 	 */
-	public HostShellAdapter(IHostShell hostShell) throws java.io.IOException {
+	public HostShellProcessAdapter(IHostShell hostShell) throws java.io.IOException {
 		this.hostShell = hostShell;
 		hostShellInput = new PipedOutputStream();
 		hostShellError = new PipedOutputStream();