diff --git a/packages/org.eclipse.epp.package.committers.product/epp.product b/packages/org.eclipse.epp.package.committers.product/epp.product
index 10378a69..a6a61535 100644
--- a/packages/org.eclipse.epp.package.committers.product/epp.product
+++ b/packages/org.eclipse.epp.package.committers.product/epp.product
@@ -237,7 +237,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.cpp.product/epp.product b/packages/org.eclipse.epp.package.cpp.product/epp.product
index 80a40e0a..10cd2c73 100644
--- a/packages/org.eclipse.epp.package.cpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.product/epp.product
@@ -235,7 +235,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.dsl.product/epp.product b/packages/org.eclipse.epp.package.dsl.product/epp.product
index a69fe4af..d792ea03 100644
--- a/packages/org.eclipse.epp.package.dsl.product/epp.product
+++ b/packages/org.eclipse.epp.package.dsl.product/epp.product
@@ -235,7 +235,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.embedcpp.product/epp.product b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
index 294fe981..e52aa235 100644
--- a/packages/org.eclipse.epp.package.embedcpp.product/epp.product
+++ b/packages/org.eclipse.epp.package.embedcpp.product/epp.product
@@ -237,7 +237,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.java.product/epp.product b/packages/org.eclipse.epp.package.java.product/epp.product
index e7d6d4f2..16933063 100644
--- a/packages/org.eclipse.epp.package.java.product/epp.product
+++ b/packages/org.eclipse.epp.package.java.product/epp.product
@@ -235,7 +235,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.jee.product/epp.product b/packages/org.eclipse.epp.package.jee.product/epp.product
index 6ba939de..05dd6aec 100644
--- a/packages/org.eclipse.epp.package.jee.product/epp.product
+++ b/packages/org.eclipse.epp.package.jee.product/epp.product
@@ -235,7 +235,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.jee/plugin_customization.ini b/packages/org.eclipse.epp.package.jee/plugin_customization.ini
index c32867f8..cd316ee9 100644
--- a/packages/org.eclipse.epp.package.jee/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.jee/plugin_customization.ini
@@ -68,4 +68,4 @@ org.eclipse.equinox.p2.ui.sdk.scheduler/download=true
 org.eclipse.oomph.setup.ui/enable.preference.recorder=false
 
 # Invert colors in terminal, i.e. black background
-org.eclipse.tm.terminal.control/TerminalPrefInvertColors=true
+org.eclipse.terminal.control/TerminalPrefInvertColors=true
diff --git a/packages/org.eclipse.epp.package.modeling.product/epp.product b/packages/org.eclipse.epp.package.modeling.product/epp.product
index 1c3c1f6f..b1c8c0b1 100644
--- a/packages/org.eclipse.epp.package.modeling.product/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.product/epp.product
@@ -237,7 +237,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.php.product/epp.product b/packages/org.eclipse.epp.package.php.product/epp.product
index 15e33d6d..6bdf27d4 100644
--- a/packages/org.eclipse.epp.package.php.product/epp.product
+++ b/packages/org.eclipse.epp.package.php.product/epp.product
@@ -237,7 +237,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.php/plugin_customization.ini b/packages/org.eclipse.epp.package.php/plugin_customization.ini
index 67d511f4..5e1d0f0b 100644
--- a/packages/org.eclipse.epp.package.php/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.php/plugin_customization.ini
@@ -68,7 +68,7 @@ org.eclipse.oomph.setup.ui/enable.preference.recorder=false
 org.eclipse.dltk.core/org.eclipse.dltk.core.indexer.id=org.eclipse.dltk.core.index.lucene.indexer
 
 # Invert colors in terminal, i.e. black background
-org.eclipse.tm.terminal.control/TerminalPrefInvertColors=true
+org.eclipse.terminal.control/TerminalPrefInvertColors=true
 
 # Add .buildpath to the default file filtering of synchronized projects
 org.eclipse.ptp.rdt.sync.core/pattern/0/rule=-/.project
diff --git a/packages/org.eclipse.epp.package.rcp.product/epp.product b/packages/org.eclipse.epp.package.rcp.product/epp.product
index 7cd2baac..e93bfcec 100644
--- a/packages/org.eclipse.epp.package.rcp.product/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.product/epp.product
@@ -235,7 +235,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>
diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product
index b6ff9c36..ebbcaa83 100644
--- a/packages/org.eclipse.epp.package.scout.product/epp.product
+++ b/packages/org.eclipse.epp.package.scout.product/epp.product
@@ -237,7 +237,7 @@ United States, other countries, or both.
       <feature id="org.eclipse.platform" installMode="root"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.oomph.setup" installMode="root"/>
-      <feature id="org.eclipse.tm.terminal.feature" installMode="root"/>
+      <feature id="org.eclipse.terminal.feature" installMode="root"/>
       <feature id="org.eclipse.justj.epp" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
       <feature id="org.eclipse.jgit" installMode="root"/>