diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
index 8afb0679535..5ed7a2f085a 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
@@ -581,7 +581,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
 			SystemSignonInformation info = getPasswordInformation();
 			int daemonPort = serverLauncher.getDaemonPort();
 			
-			/* String daemonPortStr = getSubSystem().getVendorAttribute("IBM", "DAEMON_PORT");
+			/* String daemonPortStr = getSubSystem().getVendorAttribute("Remote", "DAEMON_PORT");
 			if (daemonPortStr != null && daemonPortStr.length() > 0)
 			{
 				daemonPort = Integer.parseInt(daemonPortStr);
diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java
index df80af17d5b..de4d199166a 100644
--- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java
+++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java
@@ -173,7 +173,7 @@ public interface IRemoteServerLauncher extends IServerLauncherProperties{
 	 * <p>
 	 * You normally do not call this! Rather, your subsystem factory class will override
 	 * {@link org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchType(ServerLaunchType)}.
-	 * However, this method is needed by ISVs that re-use IBM-supplied subsystem factories,
+	 * However, this method is needed by ISVs that re-use predefined subsystem factories,
 	 * and merely supply their own IConnectorService object via the "systemClass" attribute of the
 	 * subsystemConfigurations extension point. They don't call this method directly actually, but
 	 * rather {@link AbstractConnectorService#enableServerLaunchType(SubSystem, ServerLaunchType, boolean)},
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
index 7fa5b60daf0..8782d675384 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * Michael Berber (IBM) - Patch to remove non-standard expand/collapse from menu.
+ * Michael Berger (IBM) - Patch to remove non-standard expand/collapse from menu.
  ********************************************************************************/
 
 package org.eclipse.rse.ui.view;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
index 7fa5b60daf0..8782d675384 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java
@@ -11,7 +11,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * Michael Berber (IBM) - Patch to remove non-standard expand/collapse from menu.
+ * Michael Berger (IBM) - Patch to remove non-standard expand/collapse from menu.
  ********************************************************************************/
 
 package org.eclipse.rse.ui.view;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java
index c5de40d7605..66ea5f57ffe 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Shell;
 
 
 /**
- * Base IBM server launcher form.  Extend this to provide a specialized server launcher form
+ * Base Remote server launcher form.  Extend this to provide a specialized server launcher form
  */
 public abstract class RemoteBaseServerLauncherForm extends SystemBaseForm implements IServerLauncherForm, RemoteServerLauncherConstants, ISystemConnectionWizardErrorUpdater
 {
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java
index b90ef9dd625..963f86291ea 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java
@@ -17,7 +17,7 @@
 package org.eclipse.rse.core.internal.subsystems;
 
 /**
- * This interface defines constants for IBM Server Launcher.
+ * This interface defines constants for the Remote Server Launcher.
  */
 public interface RemoteServerLauncherConstants 
 {
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
index 15e86e33ea3..34886c86ea8 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
@@ -856,8 +856,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
 
  
 	// ---------------------------------------------------
-	// Methods for IBM partners to add their own 
-	//  persisted attributes to the subsystem object...
+	// Methods for ISVs to add their own 
+	// persisted attributes to the subsystem object...
 	// ---------------------------------------------------    
 	
 	/**