diff --git a/terminal/repos/org.eclipse.tm.terminal.repo/category.xml b/terminal/repos/org.eclipse.tm.terminal.repo/category.xml
index 994bf831d9d..6129e23e60c 100644
--- a/terminal/repos/org.eclipse.tm.terminal.repo/category.xml
+++ b/terminal/repos/org.eclipse.tm.terminal.repo/category.xml
@@ -1,76 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="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="terminal_main"/>
-   </feature>
+   <feature id="org.eclipse.tm.terminal.control.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.control.sdk.feature"><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="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="terminal_main"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.connector.cdtserial.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.cdtserial.feature" version="0.0.0">
-      <category name="terminal_main"/>
-   </feature>
-   <feature url="features/org.eclipse.tm.terminal.connector.cdtserial.sdk.feature_0.0.0.jar" id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature" version="0.0.0">
-      <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="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="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="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="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="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="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="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="terminal_main"/>
-   </feature>
+   <feature id="org.eclipse.tm.terminal.connector.local.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.local.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.cdtserial.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.cdtserial.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.serial.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.serial.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.ssh.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.ssh.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.telnet.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.telnet.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.remote.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.connector.remote.sdk.feature"><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="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="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="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="terminal_main"/>
-   </feature>
+   <feature id="org.eclipse.tm.terminal.view.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.view.sdk.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.view.rse.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.view.rse.sdk.feature"><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="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="terminal_main"/>
-   </feature>
+   <feature id="org.eclipse.tm.terminal.feature"><category name="terminal_main"/></feature>
+   <feature id="org.eclipse.tm.terminal.sdk.feature"><category name="terminal_main"/></feature>
    
-   <category-def name="terminal_main" label="TM Terminal Main Features">
+   <category-def name="terminal_main" label="TM Terminal Features">
       <description>
-         TM Terminal Main Features
+         TM Terminal Features
       </description>
    </category-def>
 </site>