diff --git a/repos/org.eclipse.tm.terminal.repo/category.xml b/repos/org.eclipse.tm.terminal.repo/category.xml
index 4ecf2e72e45..cd76b8c54c8 100644
--- a/repos/org.eclipse.tm.terminal.repo/category.xml
+++ b/repos/org.eclipse.tm.terminal.repo/category.xml
@@ -2,67 +2,67 @@
 <site>
    <!-- Terminal Control Features -->
    <feature url="features/org.eclipse.tm.terminal.control.feature_0.0.0.jar" id="org.eclipse.tm.terminal.control.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.control.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.control.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    
    <!-- Terminal Connector Features -->
    <feature url="features/org.eclipse.tm.terminal.connector.local.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.local.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.local.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.local.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.serial.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.serial.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.serial.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.serial.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.ssh.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.ssh.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.ssh.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.ssh.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.telnet.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.telnet.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.telnet.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.telnet.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.remote.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.connector.remote.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.remote.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
 
    <!-- Terminal View Features -->
    <feature url="features/org.eclipse.tm.terminal.view.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.view.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.view.rse.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.rse.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.view.rse.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.view.rse.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
 
    <!-- TM Terminal "all-in-one" features -->
    <feature url="features/org.eclipse.tm.terminal.feature_0.0.0.jar" id="org.eclipse.tm.terminal.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.sdk.feature" version="0.0.0">
-      <category name="tm_main"/>
+      <category name="terminal_main"/>
    </feature>
    
-   <category-def name="tm_main" label="TM Terminal 4.0 Main Features">
+   <category-def name="terminal_main" label="TM Terminal 4.0 Main Features">
       <description>
          TM Terminal Main Features
       </description>