diff --git a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/CreateRemoteProjectActionDelegate.java b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/CreateRemoteProjectActionDelegate.java
index 545faa14113..cb5a94fc8e9 100644
--- a/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/CreateRemoteProjectActionDelegate.java
+++ b/rse/plugins/org.eclipse.rse.efs.ui/src/org/eclipse/rse/internal/efs/ui/CreateRemoteProjectActionDelegate.java
@@ -182,7 +182,7 @@ public class CreateRemoteProjectActionDelegate implements IActionDelegate {
 	{
 		IWorkspaceRoot root = SystemBasePlugin.getWorkspaceRoot();
 
-		String projectName = directory.getSystemConnection().getAliasName() + '_' + directory.getName();
+		String projectName = directory.getHost().getAliasName() + '_' + directory.getName();
 		projectName = projectName.replaceAll("[/:*?\"<>|\\\\]", ""); //$NON-NLS-1$ //$NON-NLS-2$
 		IProject editProject = root.getProject(projectName);
 
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java
index 29590997b9e..f692b8bb8e8 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.java
@@ -277,7 +277,7 @@ public class SystemSelectRemoteFileAction extends SystemBaseDialogAction
 	 */
 	public void setRootFolder(IRemoteFile rootFolder)
 	{
-		setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath());
+		setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
 	}
 	/**
 	 * Set a file or folder to preselect. This will:
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java
index c1195c0d2cd..d94fd699275 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.java
@@ -243,7 +243,7 @@ public class SystemSelectRemoteFolderAction extends SystemBaseDialogAction
 	 */
 	public void setRootFolder(IRemoteFile rootFolder)
 	{
-		setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath());
+		setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
 	}
 	/**
 	 * Set a file or folder to preselect. This will:
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
index 5606c880c24..b5e4e8f0f29 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
@@ -1382,7 +1382,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP
 
 		try
 		{
-			if (remoteFile.getSystemConnection().getSystemType().isLocal())
+			if (remoteFile.getHost().getSystemType().isLocal())
 			{
 				// Open local files "in-place", i.e. don't copy them to the 
 				// RemoteSystemsTempFiles project first
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
index a92f169e107..ce1612d436d 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
@@ -2346,7 +2346,7 @@ public class UniversalFileTransferUtility
 
 		String absolutePath = srcFileOrFolder.getAbsolutePath();
 
-		if (srcFileOrFolder.getSystemConnection().getSystemType().isLocal())
+		if (srcFileOrFolder.getHost().getSystemType().isLocal())
 		{
 			absolutePath = editMgr.getWorkspacePathFor(actualHost, srcFileOrFolder.getAbsolutePath(), srcFileOrFolder.getParentRemoteFileSubSystem());
 		}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
index e84936a9eb2..9a4f8edbab4 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
@@ -733,7 +733,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite
 		  	    currFolder = getFolder();
 		  	  } catch (Exception exc) {}
 		  	  if (currFolder != null)
-		  	    defaultConnection = currFolder.getSystemConnection();
+		  	    defaultConnection = currFolder.getHost();
 		  	    
 		  	  if (browseAction == null)
 		  	  {
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
index c0b5cb0655d..aebb864922e 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java
@@ -372,7 +372,7 @@ public class SystemSelectRemoteFileOrFolderForm
 	 */
 	public void setRootFolder(IRemoteFile rootFolder)
 	{
-		setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath());
+		setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
 	}
 	/**
 	 * Set a file or folder to preselect. This will:
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java
index 679c6956057..dfc7a910ae1 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemCopyRemoteFileAction.java
@@ -258,8 +258,8 @@ implements  IValidatorRemoteSelection
 		targetFolder    = (IRemoteFile)targetContainer;
 		IRemoteFile srcFileOrFolder = (IRemoteFile)oldObject;
 
-		IHost targetConnection = targetFolder.getSystemConnection();
-		IHost srcConnection    = srcFileOrFolder.getSystemConnection();
+		IHost targetConnection = targetFolder.getHost();
+		IHost srcConnection    = srcFileOrFolder.getHost();
 
 		boolean ok = false;
 		if (targetConnection == srcConnection)
@@ -421,7 +421,7 @@ implements  IValidatorRemoteSelection
 		String dlgTitle = (mode==MODE_COPY ? SystemResources.RESID_COPY_TITLE : SystemResources.RESID_MOVE_TITLE);
 
 		firstSelection = getFirstSelectedFile();
-		sourceConnection = firstSelection.getSystemConnection();
+		sourceConnection = firstSelection.getHost();
 		SystemRemoteFolderDialog dlg = new SystemRemoteFolderDialog(shell, dlgTitle, sourceConnection);
 		dlg.setNeedsProgressMonitor(true);
 		dlg.setMessage(getPromptString());
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
index 423e178e483..ac1ed9dbf00 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchPage.java
@@ -934,14 +934,14 @@ public class SystemSearchPage extends DialogPage implements ISearchPage {
 					// if it's a file, but not an archive, get the file name, connection info, and parent folder name
 					if (supportsSearch && remoteFile.isFile() && !remoteFile.isArchive()) {
 						fileName = remoteFile.getName();
-						IHost conn = remoteFile.getSystemConnection();
+						IHost conn = remoteFile.getHost();
 						profileName = conn.getSystemProfileName();
 						connectionName = conn.getAliasName();
 						folderName = remoteFile.getParentPath();
 					}
 					// otherwise if it's a folder or an archive, get the connection info and the name
 					else if (supportsSearch && (remoteFile.isDirectory() || (remoteFile.isArchive() && supportsArchiveManagement))) {
-						IHost conn = remoteFile.getSystemConnection();
+						IHost conn = remoteFile.getHost();
 						profileName = conn.getSystemProfileName();
 						connectionName = conn.getAliasName();
 						folderName = remoteFile.getAbsolutePath();
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderAction.java
index e06e998ab08..0d6d723d574 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/search/SystemSearchRemoteFolderAction.java
@@ -196,7 +196,7 @@ public class SystemSearchRemoteFolderAction extends SystemSelectRemoteFolderActi
 	 */
 	public void setRootFolder(IRemoteFile rootFolder)
 	{
-		setRootFolder(rootFolder.getSystemConnection(),rootFolder.getAbsolutePath());
+		setRootFolder(rootFolder.getHost(),rootFolder.getAbsolutePath());
 	}
 	/**
 	 * Set a file or folder to preselect. This will:
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index fd85e9602bc..f0164a9b6f2 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -2135,7 +2135,7 @@ public class SystemViewRemoteFileAdapter
 							{
 								String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND,
 										srcFileOrFolder.getAbsolutePath(),
-										srcFileOrFolder.getSystemConnection().getAliasName());
+										srcFileOrFolder.getHost().getAliasName());
 
 								SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID,
 										ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND,
@@ -2545,7 +2545,7 @@ public class SystemViewRemoteFileAdapter
 						{
 							String msgTxt = NLS.bind(FileResources.MSG_ERROR_FILE_NOTFOUND,
 									srcFileOrFolder.getAbsolutePath(),
-									srcFileOrFolder.getSystemConnection().getAliasName());
+									srcFileOrFolder.getHost().getAliasName());
 
 							SystemMessage errorMessage = new SimpleSystemMessage(Activator.PLUGIN_ID,
 									ISystemFileConstants.MSG_ERROR_FILE_NOTFOUND,
diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java
index 081c65b445c..0ca4a7be89d 100644
--- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java
+++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteFileImportOperation.java
@@ -459,7 +459,7 @@ public class RemoteFileImportOperation extends WorkspaceModifyOperation {
 			return;
 		}
 		try {
-			IRemoteFileSubSystem rfss = RemoteFileUtility.getFileSubSystem(((UniFilePlus) fileObject).remoteFile.getSystemConnection());
+			IRemoteFileSubSystem rfss = RemoteFileUtility.getFileSubSystem(((UniFilePlus) fileObject).remoteFile.getHost());
 			// 030820: added the following kludge to circumvent problem in
 			// artemis.  (artemis 3 will fix this)
 			// TODO remove for 6.0
diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java
index a37e52eb8a4..30ffcd94dbb 100644
--- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java
+++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/Utilities.java
@@ -73,7 +73,7 @@ public class Utilities {
 	 * IRemoteFile object.
 	 */
 	public static String getAsString(IRemoteFile selectedDirectory) {
-		return selectedDirectory.getSystemConnection().getSystemProfileName() + '.' + selectedDirectory.getSystemConnection().getAliasName() + ":" + selectedDirectory.getAbsolutePath(); //$NON-NLS-1$
+		return selectedDirectory.getHost().getSystemProfileName() + '.' + selectedDirectory.getHost().getAliasName() + ":" + selectedDirectory.getAbsolutePath(); //$NON-NLS-1$
 	}
 
 	/**
@@ -81,7 +81,7 @@ public class Utilities {
 	 * UniFilePlus object.
 	 */
 	public static String getAsString(UniFilePlus selectedDirectory) {
-		return selectedDirectory.remoteFile.getSystemConnection().getSystemProfileName() + '.' + selectedDirectory.remoteFile.getSystemConnection().getAliasName() + ":" + selectedDirectory.getPath(); //$NON-NLS-1$
+		return selectedDirectory.remoteFile.getHost().getSystemProfileName() + '.' + selectedDirectory.remoteFile.getHost().getAliasName() + ":" + selectedDirectory.getPath(); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java
index 004c5430466..3628d9d52de 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java
+++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemCommandAction.java
@@ -493,7 +493,7 @@ public class SystemCommandAction extends SystemBaseAction
 			return _cmdSubSystem;
 		}
 
-		IHost sysConn = selectedFile.getSystemConnection();
+		IHost sysConn = selectedFile.getHost();
 		if (sysConn != null)
 		{
 			ISubSystem currSubSystem = selectedFile.getParentRemoteFileSubSystem();
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
index fccc5e7817c..dafb68f9017 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
@@ -352,7 +352,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
      */
     public String getAbsolutePathPlusConnection()
     {
-    	IHost conn = getSystemConnection();
+    	IHost conn = getHost();
     	if (conn == null)
     	  return getAbsolutePath();
     	else
@@ -1127,7 +1127,7 @@ public abstract class RemoteFile implements IRemoteFile,  IAdaptable, Comparable
 	
 	public String getHostName()
 	{
-		return getSystemConnection().getHostName();
+		return getHost().getHostName();
 	}
 
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSchedulingRule.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSchedulingRule.java
index 696d3488bd9..bf5f9fb57fb 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSchedulingRule.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSchedulingRule.java
@@ -70,6 +70,6 @@ public class RemoteFileSchedulingRule implements ISchedulingRule
 	
 	public String getHostName()
 	{
-		return _file.getSystemConnection().getHostName();
+		return _file.getHost().getHostName();
 	}
 }
\ No newline at end of file