diff --git a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
index 983e798da1c..a80f465d793 100644
--- a/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
+++ b/terminal/org.eclipse.tm.terminal.serial/src/org/eclipse/tm/internal/terminal/serial/Activator.java
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tm.internal.terminal.provisional.api.serial"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.tm.terminal.serial.serial"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
index 57f69b06709..09dbc26c615 100644
--- a/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
+++ b/terminal/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/Activator.java
@@ -24,7 +24,7 @@ import org.osgi.util.tracker.ServiceTracker;
  */
 public class Activator extends Plugin {
 
-	public static final String PLUGIN_ID = "org.eclipse.tm.internal.terminal.provisional.api.ssh"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.eclipse.tm.terminal.ssh"; //$NON-NLS-1$
 	private static Activator plugin;
 
 	// ServiceTracker for IJschService
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
index 58e2362c250..fc8a994c98a 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
@@ -149,7 +149,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalLi
 			// millisecond.
 
 			getSite().getPage().showView(
-					"org.eclipse.tm.internal.terminal.provisional.api.view.TerminalView",//$NON-NLS-1$
+					"org.eclipse.tm.terminal.view.TerminalView",//$NON-NLS-1$
 					"SecondaryTerminal" + System.currentTimeMillis(), //$NON-NLS-1$
 					IWorkbenchPage.VIEW_ACTIVATE);
 		} catch (PartInitException ex) {
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
index 9a0fcb446c4..733162398a6 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalViewPlugin.java
@@ -29,8 +29,6 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class TerminalViewPlugin extends AbstractUIPlugin {
 	protected static TerminalViewPlugin fDefault;
-	public static final String  PLUGIN_HOME = "org.eclipse.tm.internal.terminal.provisional.api"; //$NON-NLS-1$
-	public static final String  HELP_VIEW   = PLUGIN_HOME + ".terminal_view"; //$NON-NLS-1$
 
 	/**
 	 * The constructor.
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
index 08cecbc5846..71c1048e383 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
@@ -559,7 +559,7 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
 			IContextService contextService = (IContextService) PlatformUI
 					.getWorkbench().getAdapter(IContextService.class);
 			contextActivation = contextService
-					.activateContext("org.eclipse.tm.internal.terminal.provisional.api.TerminalContext"); //$NON-NLS-1$
+					.activateContext("org.eclipse.tm.terminal.TerminalContext"); //$NON-NLS-1$
 		}
 
 		public void focusLost(FocusEvent event) {
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
index ca2e1abe005..d8e38bb5e26 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalPlugin.java
@@ -22,7 +22,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class TerminalPlugin extends AbstractUIPlugin {
 	protected static TerminalPlugin fDefault;
-	public static final String  PLUGIN_ID  = "org.eclipse.tm.internal.terminal.provisional.api"; //$NON-NLS-1$
+	public static final String  PLUGIN_ID  = "org.eclipse.tm.terminal"; //$NON-NLS-1$
 	public static final String  HELP_VIEW  = PLUGIN_ID + ".terminal_view"; //$NON-NLS-1$
 
 	/**
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
index c94aec6ec82..c70b1f0d580 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/provisional/api/Logger.java
@@ -37,11 +37,11 @@ import java.io.PrintStream;
  * </p>
  */
 public final class Logger {
-    public static final String  TRACE_DEBUG_LOG                = "org.eclipse.tm.internal.terminal.provisional.api/debug/log"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_ERROR          = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/error"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_INFO           = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/info"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_CHAR           = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/char"; //$NON-NLS-1$
-    public static final String  TRACE_DEBUG_LOG_BUFFER_SIZE    = "org.eclipse.tm.internal.terminal.provisional.api/debug/log/buffer/size"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG                = "org.eclipse.tm.terminal/debug/log"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_ERROR          = "org.eclipse.tm.terminal/debug/log/error"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_INFO           = "org.eclipse.tm.terminal/debug/log/info"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_CHAR           = "org.eclipse.tm.terminal/debug/log/char"; //$NON-NLS-1$
+    public static final String  TRACE_DEBUG_LOG_BUFFER_SIZE    = "org.eclipse.tm.terminal/debug/log/buffer/size"; //$NON-NLS-1$
 
     private static PrintStream logStream;