diff --git a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
index cbd24d0..f65a9e3 100644
--- a/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
+++ b/product/plugins/com.jboss.jbds.central.discovery/plugin.xml
@@ -264,7 +264,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
             description="Tool support for FindBugs"
-            id="edu.umd.cs.findbugs.plugin.eclipse"
+            id="com.jboss.jbds.findbugs.feature"
             kind="task"
             license="Free, LGPL"
             name="FindBugs"
@@ -301,17 +301,12 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
             description="Tool support for JSLint"
-            id="com.rockstarapps.workbench.branding.feature"
+            id="com.jboss.jbds.jslint.feature"
             kind="task"
             license="Free, ASL"
             name="JSLint"
             provider="Rockstarapps.com"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
-            <iu id="com.rockstarapps.aws.feature"/>
-			<iu id="com.rockstarapps.html.core.feature"/>
-			<iu id="com.rockstarapps.jsLex"/>
-			<iu id="com.rockstarapps.jsLint"/>
-			<iu id="com.rockstarapps.workbench.branding.feature"/>
          <icon
                image32="images/jslint_32.png">
          </icon>
@@ -322,7 +317,7 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
             description="Tool support for PMD"
-            id="net.sourceforge.pmd.eclipse"
+            id="com.jboss.jbds.pmd.feature"
             kind="task"
             license="Free, PMD License"
             name="PMD"
@@ -338,7 +333,7 @@
 	  <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.testing"
             description="Tool support for TestNG"
-            id="org.testng.eclipse"
+            id="com.jboss.jbds.testng.feature"
             kind="task"
             license="Free, ASL"
             name="TestNG"
@@ -368,14 +363,12 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.web"
             description="Google Plugin for Eclipse (GPE) + Google Web Toolkit SDK (GWT)"
-            id="com.google.gwt.eclipse.sdkbundle.e37.feature"
+            id="com.jboss.jbds.gwt.feature"
             kind="task"
             license="EPL, Other"
             name="Google Plugin + Web Toolkit"
             provider="Google, Inc."
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
-            <iu id="com.google.gwt.eclipse.sdkbundle.e37.feature"/>
-            <iu id="com.google.gdt.eclipse.suite.e37.feature"/>
          <icon
                image32="images/google_32.png">
          </icon>
@@ -386,19 +379,12 @@
       <connectorDescriptor
             categoryId="org.jboss.tools.central.discovery.web"
             description="Tool support for the Spring Framework"
-            id="org.springframework.ide.eclipse.feature"
+            id="com.jboss.jbds.springide.feature"
             kind="task"
             license="Free, EPL, Other"
             name="Spring IDE"
             provider="Spring IDE Developers"
             siteUrl="http://devstudio.jboss.com/updates/5.0/staging/extras/">
-            <iu id="org.springframework.ide.eclipse.aop.feature"/>
-            <iu id="org.springframework.ide.eclipse.autowire.feature"/>
-            <iu id="org.springframework.ide.eclipse.feature"/>
-            <iu id="org.springframework.ide.eclipse.integration.feature"/>
-            <iu id="org.springframework.ide.eclipse.osgi.feature"/>
-            <iu id="org.springframework.ide.eclipse.webflow.feature"/>
-            <iu id="org.springframework.ide.eclipse.security.feature"/>
          <icon
                image32="images/springide_32.png">
          </icon>