Fixed TCF package names in import statements.

30 files changed, 140 insertions, 140 deletions

diff --git a/plugins/org.eclipse.tcf.rse/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.rse/META-INF/MANIFEST.MF
index c4bb63f94..4a4b19762 100644
--- a/plugins/org.eclipse.tcf.rse/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tcf.rse/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tm.tcf.rse;singleton:=true
+Bundle-SymbolicName: org.eclipse.tcf.rse;singleton:=true
 Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.tm.internal.tcf.rse.Activator
+Bundle-Activator: org.eclipse.tcf.internal.rse.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -18,14 +18,14 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.subsystems.terminals.core,
  org.eclipse.rse.subsystems.shells.core;bundle-version="3.1.100",
  org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.tm.tcf;bundle-version="0.5.0",

- org.eclipse.tm.tcf.core;bundle-version="0.5.0"
+ org.eclipse.tcf;bundle-version="0.5.0",

+ org.eclipse.tcf.core;bundle-version="0.5.0"
 Import-Package: org.eclipse.rse.core.filters,
  org.eclipse.rse.core.model,

- org.eclipse.tm.tcf.core,
- org.eclipse.tm.tcf.protocol,
- org.eclipse.tm.tcf.services,
- org.eclipse.tm.tcf.util
+ org.eclipse.tcf.core,
+ org.eclipse.tcf.protocol,
+ org.eclipse.tcf.services,
+ org.eclipse.tcf.util
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.tcf.rse/plugin.xml b/plugins/org.eclipse.tcf.rse/plugin.xml
index 343aeb900..a216b7a3c 100644
--- a/plugins/org.eclipse.tcf.rse/plugin.xml
+++ b/plugins/org.eclipse.tcf.rse/plugin.xml
@@ -18,7 +18,7 @@
             description="Connects using Target Communication Framework"
             icon="icons/tcf.gif"
             iconLive="icons/tcf.gif"
-            id="org.eclipse.tm.tcf.rse.systemType"
+            id="org.eclipse.tcf.rse.systemType"
             label="TCF"
             name="TCF">
       </systemType>
@@ -27,14 +27,14 @@
          point="org.eclipse.rse.core.subsystemConfigurations">
       <configuration
             category="processes"
-            class="org.eclipse.tm.internal.tcf.rse.processes.TCFProcessSubSystemConfiguration"
+            class="org.eclipse.tcf.internal.rse.processes.TCFProcessSubSystemConfiguration"
             description="Processes"
             icon="icons/system-processes.gif"
             iconlive="icons/system-processes-live.gif"
-            id="org.eclipse.tm.tcf.rse.Processes"
+            id="org.eclipse.tcf.rse.Processes"
             name="Processes"
             priority="200"
-            systemTypeIds="org.eclipse.tm.tcf.rse.systemType"
+            systemTypeIds="org.eclipse.tcf.rse.systemType"
             vendor="Wind River">
       </configuration>
       </extension>
@@ -42,14 +42,14 @@
 		point="org.eclipse.rse.core.subsystemConfigurations">
 		<configuration
         category="shells"
-        class="org.eclipse.tm.internal.tcf.rse.shells.TCFShellSubSystemConfiguration"
+        class="org.eclipse.tcf.internal.rse.shells.TCFShellSubSystemConfiguration"
         description="Shells"
         icon="icons/systemshell.gif"
         iconlive="icons/systemshelllive.gif"
-        id="org.eclipse.tm.tcf.rse.Shells"
+        id="org.eclipse.tcf.rse.Shells"
         name="Shells"
         priority="200"
-        systemTypeIds="org.eclipse.tm.tcf.rse.systemType"
+        systemTypeIds="org.eclipse.tcf.rse.systemType"
         vendor="Eclipse.org">
 		</configuration>
 	</extension>
@@ -57,14 +57,14 @@
          point="org.eclipse.rse.core.subsystemConfigurations">
       <configuration
             category="files"
-            class="org.eclipse.tm.internal.tcf.rse.files.TCFFileSubSystemConfiguration"
+            class="org.eclipse.tcf.internal.rse.files.TCFFileSubSystemConfiguration"
             description="Files"
             icon="icons/system-files.gif"
             iconlive="icons/system-files-live.gif"
-            id="org.eclipse.tm.tcf.rse.Files"
+            id="org.eclipse.tcf.rse.Files"
             name="Files"
             priority="200"
-            systemTypeIds="org.eclipse.tm.tcf.rse.systemType"
+            systemTypeIds="org.eclipse.tcf.rse.systemType"
             vendor="Wind River">
       </configuration>
    </extension>
@@ -72,19 +72,19 @@
         point="org.eclipse.rse.core.subsystemConfigurations">
         <configuration
         category="terminals"
-        class="org.eclipse.tm.internal.tcf.rse.terminals.TCFTerminalServiceSubSystemConfiguration"
+        class="org.eclipse.tcf.internal.rse.terminals.TCFTerminalServiceSubSystemConfiguration"
         description="TCF Terminal Service Description"
-        id="org.eclipse.tm.tcf.rse.Terminals"
+        id="org.eclipse.tcf.rse.Terminals"
         name="Terminals"
         priority="200"
-        systemTypeIds="org.eclipse.tm.tcf.rse.systemType"
+        systemTypeIds="org.eclipse.tcf.rse.systemType"
         vendor="Eclipse.org">
         </configuration>
     </extension>
    <extension point="org.eclipse.core.runtime.adapters">
       <factory
-            class="org.eclipse.tm.internal.tcf.rse.processes.TCFSystemViewProcessAdapterFactory"
-            adaptableType="org.eclipse.tm.internal.tcf.rse.processes.TCFRemoteProcess">
+            class="org.eclipse.tcf.internal.rse.processes.TCFSystemViewProcessAdapterFactory"
+            adaptableType="org.eclipse.tcf.internal.rse.processes.TCFRemoteProcess">
             <adapter type="org.eclipse.rse.ui.view.ISystemViewElementAdapter"/>
             <adapter type="org.eclipse.rse.core.subsystems.ISystemDragDropAdapter"/>
             <adapter type="org.eclipse.rse.ui.view.ISystemRemoteElementAdapter"/>
diff --git a/plugins/org.eclipse.tcf.rse/pom.xml b/plugins/org.eclipse.tcf.rse/pom.xml
index 1ab6df9fd..b031208bc 100644
--- a/plugins/org.eclipse.tcf.rse/pom.xml
+++ b/plugins/org.eclipse.tcf.rse/pom.xml
@@ -12,6 +12,6 @@
   </parent>
 
   <version>0.5.0-SNAPSHOT</version>
-  <artifactId>org.eclipse.tm.tcf.rse</artifactId>
+  <artifactId>org.eclipse.tcf.rse</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Activator.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Activator.java
index 794836daa..7290c23d3 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Activator.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Activator.java
@@ -7,9 +7,9 @@
  *
  * Contributors:
  *     Wind River Systems - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.tm.tcf.rse"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "org.eclipse.tcf.rse"; //$NON-NLS-1$
 
     // The shared instance
     private static Activator plugin;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFService.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFService.java
index 79f1e4624..3053e52d3 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFService.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFService.java
@@ -11,7 +11,7 @@
  * Martin Oberhuber (Wind River) - [170910] Adopt RSE ITerminalService API for SSH
  * Intel Corporation             - [329654] Make all sub services operate against TCF connector service
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 /**
  * Markup Interface for services using the TCFConnectorService.
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSessionProvider.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSessionProvider.java
index a39e892c2..871ac84d2 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSessionProvider.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSessionProvider.java
@@ -9,10 +9,10 @@
  *    Intel Corporation - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import org.eclipse.rse.services.files.RemoteFileException;
-import org.eclipse.tm.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IChannel;
 
 public interface ITCFSessionProvider {
     public static final int ERROR_CODE = 100; // filed error code
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSubSystem.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSubSystem.java
index 30bc23f90..8930ecd70 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSubSystem.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/ITCFSubSystem.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import org.eclipse.rse.core.subsystems.ISubSystem;
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Messages.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Messages.java
index 2ea0c0645..532562d42 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Messages.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/Messages.java
@@ -10,7 +10,7 @@
  *     Intel Corp.            - Add TCF Connection Descriptions and File System Style
  *     Liping Ke(Intel Corp.) - Add TCF Terminal/Shell Services Descriptions
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import org.eclipse.osgi.util.NLS;
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorService.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorService.java
index 905ca1563..728deaaaa 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorService.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorService.java
@@ -8,12 +8,12 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Martin Oberhuber (Wind River) - [269682] Get port from RSE Property
- *     Uwe Stieber      (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber      (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Anna Dushistova  (MontaVista) - [285373] TCFConnectorService should send CommunicationsEvent.BEFORE_CONNECT and CommunicationsEvent.BEFORE_DISCONNECT
  *     Liping Ke        (Intel Corp.)- [326490] Add authentication to the TCF Connector Service and attach stream subs/unsubs method
  *     Jeff Johnston    (RedHat)     - [350752] TCFConnectorService doesn't recognize connections with SSL transport
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -29,18 +29,18 @@ import org.eclipse.rse.core.model.SystemSignonInformation;
 import org.eclipse.rse.core.subsystems.CommunicationsEvent;
 import org.eclipse.rse.services.files.RemoteFileException;
 import org.eclipse.rse.ui.subsystems.StandardConnectorService;
-import org.eclipse.tm.tcf.core.AbstractPeer;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IPeer;
-import org.eclipse.tm.tcf.protocol.IService;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.tcf.services.IFileSystem;
-import org.eclipse.tm.tcf.services.ILocator;
-import org.eclipse.tm.tcf.services.IStreams;
-import org.eclipse.tm.tcf.services.ISysMonitor;
-import org.eclipse.tm.tcf.services.ITerminals;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.core.AbstractPeer;
+import org.eclipse.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IPeer;
+import org.eclipse.tcf.protocol.IService;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.services.IFileSystem;
+import org.eclipse.tcf.services.ILocator;
+import org.eclipse.tcf.services.IStreams;
+import org.eclipse.tcf.services.ISysMonitor;
+import org.eclipse.tcf.services.ITerminals;
+import org.eclipse.tcf.util.TCFTask;
 
 
 public class TCFConnectorService extends StandardConnectorService implements ITCFSessionProvider{
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorServiceManager.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorServiceManager.java
index 25b423710..28e3e0409 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorServiceManager.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFConnectorServiceManager.java
@@ -7,9 +7,9 @@
  *
  * Contributors:
  *     Wind River Systems - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFRSETask.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFRSETask.java
index 4d5e5e154..c25ee0f5a 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFRSETask.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/TCFRSETask.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Martin Oberhuber (Wind River) - [238564] Adopt TM 3.0 APIs
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Uwe Stieber (Wind River) - [273572] SystemMessage contains exception class name instead of error message
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse;
+package org.eclipse.tcf.internal.rse;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.ExecutionException;
@@ -19,7 +19,7 @@ import java.util.concurrent.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.rse.services.clientserver.messages.SystemMessage;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.util.TCFTask;
 
 public abstract class TCFRSETask<V> extends TCFTask<V> {
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileAdapter.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileAdapter.java
index 7e35849b1..6865c43c8 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileAdapter.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileAdapter.java
@@ -9,7 +9,7 @@
  *     Wind River Systems - initial API and implementation
  * Martin Oberhuber (Wind River) - [238564] Adopt TM 3.0 APIs
  ******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.files;
+package org.eclipse.tcf.internal.rse.files;
 
 import org.eclipse.rse.services.files.IHostFile;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.AbstractRemoteFile;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileResource.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileResource.java
index 81a536172..ca670d79b 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileResource.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileResource.java
@@ -8,16 +8,16 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Anna Dushistova (MontaVista) - [247164][tcf] a lot of file/directory properties are not supported
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.files;
+package org.eclipse.tcf.internal.rse.files;
 
 import org.eclipse.rse.core.subsystems.AbstractResource;
 import org.eclipse.rse.services.files.HostFilePermissions;
 import org.eclipse.rse.services.files.IHostFile;
 import org.eclipse.rse.services.files.IHostFilePermissions;
 import org.eclipse.rse.services.files.IHostFilePermissionsContainer;
-import org.eclipse.tm.tcf.services.IFileSystem;
+import org.eclipse.tcf.services.IFileSystem;
 
 
 public class TCFFileResource extends AbstractResource implements IHostFile, IHostFilePermissionsContainer{
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileService.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileService.java
index afaab224b..c16ba6108 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileService.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileService.java
@@ -9,12 +9,12 @@
  *     Wind River Systems - initial API and implementation
  *     Martin Oberhuber (Wind River) - [238564] Adopt TM 3.0 APIs
  *     Uwe Stieber (Wind River) - [271224] NPE in TCFFileService#download
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Uwe Stieber (Wind River) - [274277] The TCF file service subsystem implementation is not updating the progress monitor
  *     Intel Corporation        - [326489] Make recursive copy/delete available (delete/copy a folder contains files)
  *     Intel Corporation        - [329654] Make all sub services operate against TCF connector service
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.files;
+package org.eclipse.tcf.internal.rse.files;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -44,21 +44,21 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.clientserver.messages.SystemOperationFailedException;
 import org.eclipse.rse.services.files.AbstractFileService;
 import org.eclipse.rse.services.files.IHostFile;
-import org.eclipse.tm.internal.tcf.rse.Activator;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.Messages;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager;
-import org.eclipse.tm.internal.tcf.rse.TCFRSETask;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.tcf.services.IFileSystem;
-import org.eclipse.tm.tcf.services.IFileSystem.DirEntry;
-import org.eclipse.tm.tcf.services.IFileSystem.FileAttrs;
-import org.eclipse.tm.tcf.services.IFileSystem.FileSystemException;
-import org.eclipse.tm.tcf.services.IFileSystem.IFileHandle;
-import org.eclipse.tm.tcf.util.TCFFileInputStream;
-import org.eclipse.tm.tcf.util.TCFFileOutputStream;
+import org.eclipse.tcf.internal.rse.Activator;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.Messages;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFConnectorServiceManager;
+import org.eclipse.tcf.internal.rse.TCFRSETask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.services.IFileSystem;
+import org.eclipse.tcf.services.IFileSystem.DirEntry;
+import org.eclipse.tcf.services.IFileSystem.FileAttrs;
+import org.eclipse.tcf.services.IFileSystem.FileSystemException;
+import org.eclipse.tcf.services.IFileSystem.IFileHandle;
+import org.eclipse.tcf.util.TCFFileInputStream;
+import org.eclipse.tcf.util.TCFFileOutputStream;
 
 
 public class TCFFileService extends AbstractFileService {
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileSubSystemConfiguration.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileSubSystemConfiguration.java
index 79e1dd48d..16d0a8c8f 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFFileSubSystemConfiguration.java
@@ -7,11 +7,11 @@
  *
  * Contributors:
  *     Wind River Systems       - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Intel Corp.              - Add Unix File System style detection, set TRUE by default
  *     Intel Corporation        - [329654] Make all sub services operate against TCF connector service
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.files;
+package org.eclipse.tcf.internal.rse.files;
 
 import java.util.Vector;
 
@@ -33,10 +33,10 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst
 import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
 import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.Messages;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.Messages;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFConnectorServiceManager;
 
 public class TCFFileSubSystemConfiguration extends FileServiceSubSystemConfiguration {
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFRemoteFile.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFRemoteFile.java
index 1be7f12f1..c9018d562 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFRemoteFile.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/files/TCFRemoteFile.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Anna Dushistova (MontaVista) - [247164][tcf] a lot of file/directory properties are not supported
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.files;
+package org.eclipse.tcf.internal.rse.files;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessAdapter.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessAdapter.java
index 7f43ddfc6..2d27a25a6 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessAdapter.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessAdapter.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessResource.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessResource.java
index 4fad1b6cd..878b73ad7 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessResource.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessResource.java
@@ -8,9 +8,9 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *     Anna Dushistova (MontaVista) - [246996] [tcf] NullPointerException when trying to copy the process
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -24,10 +24,10 @@ import org.eclipse.rse.core.subsystems.AbstractResource;
 import org.eclipse.rse.services.clientserver.IServiceConstants;
 import org.eclipse.rse.services.clientserver.processes.IHostProcess;
 import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.protocol.Protocol;
-import org.eclipse.tm.tcf.services.ISysMonitor;
-import org.eclipse.tm.tcf.services.ISysMonitor.SysMonitorContext;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.protocol.Protocol;
+import org.eclipse.tcf.services.ISysMonitor;
+import org.eclipse.tcf.services.ISysMonitor.SysMonitorContext;
 
 public class TCFProcessResource extends AbstractResource implements IHostProcess {
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessService.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessService.java
index 82f1bc622..de27d4c3a 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessService.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessService.java
@@ -8,10 +8,10 @@
  * Contributors:
  *     Wind River Systems            - initial API and implementation
  *     Martin Oberhuber (Wind River) - [238564] Adopt TM 3.0 APIs
- *     Uwe Stieber (Wind River)      - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River)      - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Intel Corporation             - [329654] Make all sub services operate against TCF connector service
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -31,12 +31,12 @@ import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter;
 import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants;
 import org.eclipse.rse.services.processes.AbstractProcessService;
 import org.eclipse.rse.services.processes.IProcessService;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager;
-import org.eclipse.tm.internal.tcf.rse.TCFRSETask;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.services.IProcesses;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFConnectorServiceManager;
+import org.eclipse.tcf.internal.rse.TCFRSETask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.services.IProcesses;
 
 
 public class TCFProcessService extends AbstractProcessService implements IProcessService {
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessSubSystemConfiguration.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessSubSystemConfiguration.java
index cd8698c0f..b472752cd 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFProcessSubSystemConfiguration.java
@@ -7,10 +7,10 @@
  *
  * Contributors:
  *     Wind River Systems       - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *     Intel Corporation        - [329654] Make all sub services operate against TCF connector service
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.IConnectorService;
@@ -19,9 +19,9 @@ import org.eclipse.rse.services.processes.IProcessService;
 import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter;
 import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem;
 import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFConnectorServiceManager;
 
 public class TCFProcessSubSystemConfiguration extends ProcessServiceSubSystemConfiguration {
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFRemoteProcess.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFRemoteProcess.java
index 26b10dac0..a3ca85d9d 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFRemoteProcess.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFRemoteProcess.java
@@ -7,9 +7,9 @@
  *
  * Contributors:
  *     Wind River Systems - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import java.util.Map;
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewProcessAdapterFactory.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewProcessAdapterFactory.java
index 7a9b1771a..ca5062a1c 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewProcessAdapterFactory.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewProcessAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.rse.core.subsystems.IRemoteObjectIdentifier;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewRemoteProcessAdapter.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewRemoteProcessAdapter.java
index cf14e0018..7a6c0f411 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewRemoteProcessAdapter.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/processes/TCFSystemViewRemoteProcessAdapter.java
@@ -7,9 +7,9 @@
  *
  * Contributors:
  *     Wind River Systems - initial API and implementation
- *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse
+ *     Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tcf.rse
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.processes;
+package org.eclipse.tcf.internal.rse.processes;
 
 import java.math.BigInteger;
 import java.text.NumberFormat;
@@ -45,9 +45,9 @@ import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;
 import org.eclipse.rse.ui.view.ISystemViewElementAdapter;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.tm.internal.tcf.rse.Activator;
-import org.eclipse.tm.internal.tcf.rse.Messages;
-import org.eclipse.tm.tcf.services.ISysMonitor;
+import org.eclipse.tcf.internal.rse.Activator;
+import org.eclipse.tcf.internal.rse.Messages;
+import org.eclipse.tcf.services.ISysMonitor;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFServiceCommandShell.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFServiceCommandShell.java
index f7c55c77d..b07429a60 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFServiceCommandShell.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFServiceCommandShell.java
@@ -20,7 +20,7 @@
  * Liping Ke        (Intel Corp.)- Adapted from org.eclipse.rse.internal.subsystems.shells.ssh.SshServiceCommandShell
  * Liping Ke        (Intel Corp.)- [246987] Implement TCF Shell/terminal services
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.shells;
+package org.eclipse.tcf.internal.rse.shells;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFShellSubSystemConfiguration.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFShellSubSystemConfiguration.java
index 46b5902d1..cf372e2df 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFShellSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFShellSubSystemConfiguration.java
@@ -17,7 +17,7 @@
  *  Liping Ke        (Intel Corp.)- Adapted from org.eclipse.rse.subsystems.shells.ssh.SshShellSubSystemConfiguration
  *  Liping Ke        (Intel Corp.)- [246987] Implement TCF Shell/terminal services
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.shells;
+package org.eclipse.tcf.internal.rse.shells;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.IConnectorService;
@@ -28,8 +28,8 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
 import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IServiceCommandShell;
 import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystem;
 import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration;
-import org.eclipse.tm.internal.tcf.rse.*;
-import org.eclipse.tm.internal.tcf.rse.terminals.TCFTerminalService;
+import org.eclipse.tcf.internal.rse.*;
+import org.eclipse.tcf.internal.rse.terminals.TCFTerminalService;
 
 
 public class TCFShellSubSystemConfiguration extends
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalInputStream.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalInputStream.java
index 2c7d44e18..30e3eca39 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalInputStream.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalInputStream.java
@@ -8,14 +8,14 @@
  * Contributors:
  *    Liping Ke (Intel Corp.) - initial API and implementation
  ******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.shells;
+package org.eclipse.tcf.internal.rse.shells;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.services.IStreams;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.services.IStreams;
+import org.eclipse.tcf.util.TCFTask;
 
 public class TCFTerminalInputStream extends InputStream {
     private IStreams streams;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalOutputStream.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalOutputStream.java
index ffb0bae22..b6150090b 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalOutputStream.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalOutputStream.java
@@ -8,15 +8,15 @@
  * Contributors:
  *    Liping Ke (Intel Corp.) - initial API and implementation
  ******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.shells;
+package org.eclipse.tcf.internal.rse.shells;
 
 import java.io.IOException;
 
 import java.io.OutputStream;
 
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.services.IStreams;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.services.IStreams;
+import org.eclipse.tcf.util.TCFTask;
 
 public class TCFTerminalOutputStream extends OutputStream {
 
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
index f180dd7a5..ab9e5b151 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/shells/TCFTerminalShell.java
@@ -11,7 +11,7 @@
  *    Sheldon D'souza  (Celunite)    - LoginThread and readUntil implementation
  *    Liping Ke        (Intel Corp.) - For non-login mode, we don't need detect command prompt
  ******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.shells;
+package org.eclipse.tcf.internal.rse.shells;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -32,14 +32,14 @@ import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.terminals.AbstractTerminalShell;
 import org.eclipse.rse.services.terminals.ITerminalService;
 import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.tm.internal.tcf.rse.ITCFSessionProvider;
-import org.eclipse.tm.internal.tcf.rse.Messages;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFRSETask;
-import org.eclipse.tm.tcf.protocol.IChannel;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.services.IStreams;
-import org.eclipse.tm.tcf.services.ITerminals;
+import org.eclipse.tcf.internal.rse.ITCFSessionProvider;
+import org.eclipse.tcf.internal.rse.Messages;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFRSETask;
+import org.eclipse.tcf.protocol.IChannel;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.services.IStreams;
+import org.eclipse.tcf.services.ITerminals;
 
 
 public class TCFTerminalShell extends AbstractTerminalShell {
@@ -312,7 +312,7 @@ public class TCFTerminalShell extends AbstractTerminalShell {
                 SystemMessage msg;
 
                 if (nestedException!=null) {
-                    msg = new SimpleSystemMessage(org.eclipse.tm.internal.tcf.rse.Activator.PLUGIN_ID,
+                    msg = new SimpleSystemMessage(org.eclipse.tcf.internal.rse.Activator.PLUGIN_ID,
                             ICommonMessageIds.MSG_EXCEPTION_OCCURRED,
                             IStatus.ERROR,
                             CommonMessages.MSG_EXCEPTION_OCCURRED, nestedException);
@@ -325,7 +325,7 @@ public class TCFTerminalShell extends AbstractTerminalShell {
                     else
                         strErr = "Not identified Errors";//$NON-NLS-1$
 
-                    msg = new SimpleSystemMessage(org.eclipse.tm.internal.tcf.rse.Activator.PLUGIN_ID,
+                    msg = new SimpleSystemMessage(org.eclipse.tcf.internal.rse.Activator.PLUGIN_ID,
                             ICommonMessageIds.MSG_COMM_AUTH_FAILED,
                             IStatus.ERROR,
                             strErr,
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalService.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalService.java
index e3ee65dc4..044cd8b31 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalService.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalService.java
@@ -8,17 +8,17 @@
  * Contributors:
  *    Liping Ke(Intel Corp.) - initial API and implementation
  ******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.terminals;
+package org.eclipse.tcf.internal.rse.terminals;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.terminals.AbstractTerminalService;
 import org.eclipse.rse.services.terminals.ITerminalShell;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.ITCFSessionProvider;
-import org.eclipse.tm.internal.tcf.rse.Messages;
-import org.eclipse.tm.internal.tcf.rse.shells.TCFTerminalShell;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.ITCFSessionProvider;
+import org.eclipse.tcf.internal.rse.Messages;
+import org.eclipse.tcf.internal.rse.shells.TCFTerminalShell;
 
 public class TCFTerminalService extends AbstractTerminalService implements ITCFService{
     private final ITCFSessionProvider fSessionProvider;
diff --git a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalServiceSubSystemConfiguration.java b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalServiceSubSystemConfiguration.java
index 817f1c7b2..0a97b214c 100644
--- a/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalServiceSubSystemConfiguration.java
+++ b/plugins/org.eclipse.tcf.rse/src/org/eclipse/tcf/internal/rse/terminals/TCFTerminalServiceSubSystemConfiguration.java
@@ -11,7 +11,7 @@
  * Liping Ke      (Intel Corp.) - Adapted from TerminalServiceSubSystemConfiguration
  * Liping Ke      (Intel Corp.) - TCF terminal services subsystem implementation
  *******************************************************************************/
-package org.eclipse.tm.internal.tcf.rse.terminals;
+package org.eclipse.tcf.internal.rse.terminals;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.IConnectorService;
@@ -19,9 +19,9 @@ import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.terminals.ITerminalService;
 import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystem;
 import org.eclipse.rse.subsystems.terminals.core.TerminalServiceSubSystemConfiguration;
-import org.eclipse.tm.internal.tcf.rse.ITCFService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorService;
-import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager;
+import org.eclipse.tcf.internal.rse.ITCFService;
+import org.eclipse.tcf.internal.rse.TCFConnectorService;
+import org.eclipse.tcf.internal.rse.TCFConnectorServiceManager;
 
 public class TCFTerminalServiceSubSystemConfiguration extends
         TerminalServiceSubSystemConfiguration {