diff --git a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java
index 37dd7e100a5..42a68f1e260 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/activator/UIPlugin.java
@@ -50,7 +50,7 @@ public class UIPlugin extends AbstractUIPlugin {
 		if (getDefault() != null && getDefault().getBundle() != null) {
 			return getDefault().getBundle().getSymbolicName();
 		}
-		return "org.eclipse.tm.terminal.view.ui.local"; //$NON-NLS-1$
+		return "org.eclipse.tm.terminal.connector.local"; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java
index 24ca4d41b94..c37bf6bae3b 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java
+++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/launcher/LocalLauncherHandler.java
@@ -57,7 +57,7 @@ public class LocalLauncherHandler extends AbstractHandler {
 		// Find the local terminal launcher delegate
 		ILauncherDelegate delegate = null;
 		for (ILauncherDelegate candidate : delegates) {
-			if ("org.eclipse.tm.terminal.view.ui.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$
+			if ("org.eclipse.tm.terminal.connector.local.launcher.local".equals(candidate.getId())) { //$NON-NLS-1$
 				delegate = candidate;
 				break;
 			}
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java
index e3f612825a3..497f132741c 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/nls/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.local.nls.Messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.local.nls.Messages"; //$NON-NLS-1$
 
 	/**
 	 * Static constructor.
diff --git a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java
index abef87a0454..b43cda633cc 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java
+++ b/plugins/org.eclipse.tm.terminal.connector.local/src/org/eclipse/tm/terminal/connector/local/showin/DynamicContributionItems.java
@@ -49,7 +49,7 @@ public class DynamicContributionItems extends CompoundContributionItem implement
 		this.serviceLocator = serviceLocator;
 
 		// Get the local terminal launcher delegate
-		delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tm.terminal.view.ui.local.launcher.local", false); //$NON-NLS-1$
+		delegate = LauncherDelegateManager.getInstance().getLauncherDelegate("org.eclipse.tm.terminal.connector.local.launcher.local", false); //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java
index 03ac3ebdb64..76a4e6e5337 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/activator/UIPlugin.java
@@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
 		if (getDefault() != null && getDefault().getBundle() != null) {
 			return getDefault().getBundle().getSymbolicName();
 		}
-		return "org.eclipse.tm.terminal.view.ui.process"; //$NON-NLS-1$
+		return "org.eclipse.tm.terminal.connector.process"; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java
index 8249cf380cc..6a418e6e705 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/nls/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.process.nls.Messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.process.nls.Messages"; //$NON-NLS-1$
 
 	/**
 	 * Static constructor.
diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java
index f38a5a244e5..8cb12475dc3 100644
--- a/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/activator/UIPlugin.java
@@ -47,7 +47,7 @@ public class UIPlugin extends AbstractUIPlugin {
 		if (getDefault() != null && getDefault().getBundle() != null) {
 			return getDefault().getBundle().getSymbolicName();
 		}
-		return "org.eclipse.tm.terminal.view.ui.serial"; //$NON-NLS-1$
+		return "org.eclipse.tm.terminal.connector.serial"; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java
index e1dbac41e31..19de4b72b40 100644
--- a/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.connector.serial/src/org/eclipse/tm/terminal/connector/serial/nls/Messages.java
@@ -17,7 +17,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.serial.nls.Messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.serial.nls.Messages"; //$NON-NLS-1$
 
 	/**
 	 * Static constructor.
diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java
index f5030c35888..8fcbc08577b 100644
--- a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/activator/UIPlugin.java
@@ -53,7 +53,7 @@ public class UIPlugin extends AbstractUIPlugin {
 		if (getDefault() != null && getDefault().getBundle() != null) {
 			return getDefault().getBundle().getSymbolicName();
 		}
-		return "org.eclipse.tm.terminal.view.ui.ssh"; //$NON-NLS-1$
+		return "org.eclipse.tm.terminal.connector.ssh"; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java
index ba432d6647c..e7c25bc7e04 100644
--- a/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.connector.ssh/src/org/eclipse/tm/terminal/connector/ssh/nls/Messages.java
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.ssh.nls.Messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.ssh.nls.Messages"; //$NON-NLS-1$
 
 	/**
 	 * Static constructor.
diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java
index 998c0e4f15b..0635b7663bb 100644
--- a/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java
+++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/activator/UIPlugin.java
@@ -48,7 +48,7 @@ public class UIPlugin extends AbstractUIPlugin {
 		if (getDefault() != null && getDefault().getBundle() != null) {
 			return getDefault().getBundle().getSymbolicName();
 		}
-		return "org.eclipse.tm.terminal.view.ui.telnet"; //$NON-NLS-1$
+		return "org.eclipse.tm.terminal.connector.telnet"; //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java
index 9d358bdddb0..058cf603611 100644
--- a/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java
+++ b/plugins/org.eclipse.tm.terminal.connector.telnet/src/org/eclipse/tm/terminal/connector/telnet/nls/Messages.java
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
 public class Messages extends NLS {
 
 	// The plug-in resource bundle name
-	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.view.ui.telnet.nls.Messages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.tm.terminal.connector.telnet.nls.Messages"; //$NON-NLS-1$
 
 	/**
 	 * Static constructor.
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java
index 361d74629e4..596e80f29c3 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/src/org/eclipse/tm/terminal/view/ui/rse/internal/LaunchTerminalHandler.java
@@ -64,7 +64,7 @@ public class LaunchTerminalHandler extends AbstractHandler {
 						@Override
 						protected boolean isFiltered(ISelection selection, ILauncherDelegate delegate) {
 							Assert.isNotNull(delegate);
-						    return !"org.eclipse.tm.terminal.view.ui.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$
+						    return !"org.eclipse.tm.terminal.connector.ssh.launcher.ssh".equals(delegate.getId()); //$NON-NLS-1$
 						}
 					};
 					dialog.setSelection(new StructuredSelection(host));
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
index 27c1fb42804..2e319c6d7e8 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
+++ b/plugins/org.eclipse.tm.terminal.view.ui/src/org/eclipse/tm/terminal/view/ui/view/TerminalsView.java
@@ -696,7 +696,7 @@ public class TerminalsView extends ViewPart implements ITerminalsView, IShowInTa
 				// If the selection is valid, fire the command to open the local terminal
 				if (isValid) {
 					ICommandService service = (ICommandService)PlatformUI.getWorkbench().getService(ICommandService.class);
-					Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.view.ui.local.command.launch") : null; //$NON-NLS-1$
+					Command command = service != null ? service.getCommand("org.eclipse.tm.terminal.connector.local.command.launch") : null; //$NON-NLS-1$
 					if (command != null && command.isDefined() && command.isEnabled()) {
 						try {
 							ParameterizedCommand pCmd = ParameterizedCommand.generateCommand(command, null);