towards a generator
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 9ddeb56..8710ae7 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -45,7 +45,13 @@
             target="getAndInstall">
             <param
                 name="groupId"
-                value="xml"/>
+                value="dtp"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
         </antcall>
     </target>
     <target
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
index 4c7bdd9..f512c31 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
@@ -81,7 +81,7 @@
         name="assemble.@featurename@_sdk.feature">
         <property
             name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
+            value="@zipprefix@-sdk-${buildLabel}.zip"/>
         <ant
             antfile="${assembleScriptName}"
             dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
         name="postPackage">
         <property
             name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
+            value="@zipprefix@-sdk-${buildLabel}.zip"/>
         <ant
             antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
             target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index 191c279..364e5bc 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -35,8 +35,15 @@
             target="getAndInstall">
             <param
                 name="groupId"
-                value="xml"/>
+                value="dtp"/>
         </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
index 68dbdf4..a5e31b0 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
@@ -81,7 +81,7 @@
         name="assemble.@featurename@_tests.feature">
         <property
             name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
+            value="@zipprefix@-tests-${buildLabel}.zip"/>
         <ant
             antfile="${assembleScriptName}"
             dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
         name="postPackage">
         <property
             name="archiveName"
-            value="@zipprefix@-${buildLabel}.zip"/>
+            value="@zipprefix@-tests-${buildLabel}.zip"/>
         <ant
             antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
             target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 8565e7e..1f45cda 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -41,8 +41,15 @@
             target="getAndInstall">
             <param
                 name="groupId"
-                value="xml"/>
+                value="dtp"/>
         </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
index f75751e..8710ae7 100644
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws/dependency.xml
@@ -45,6 +45,12 @@
             target="getAndInstall">
             <param
                 name="groupId"
+                value="dtp"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
                 value="wtp"/>
         </antcall>
     </target>
diff --git a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
index 843d52f..24712e7 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
@@ -81,7 +81,7 @@
         name="assemble.org.eclipse.jst.ws.cxf_sdk.feature">
         <property
             name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+            value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
         <ant
             antfile="${assembleScriptName}"
             dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
         name="postPackage">
         <property
             name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+            value="wtp-incubator-jaxws-sdk-${buildLabel}.zip"/>
         <ant
             antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
             target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
index 269090d..364e5bc 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
@@ -35,8 +35,15 @@
             target="getAndInstall">
             <param
                 name="groupId"
+                value="dtp"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
                 value="wtp"/>
         </antcall>
+
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
index 5acd32d..8c01a04 100644
--- a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
@@ -81,7 +81,7 @@
         name="assemble.org.eclipse.jst.ws.cxf_tests.feature">
         <property
             name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+            value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
         <ant
             antfile="${assembleScriptName}"
             dir="${buildDirectory}"/>
@@ -92,7 +92,7 @@
         name="postPackage">
         <property
             name="archiveName"
-            value="wtp-incubator-jaxws-${buildLabel}.zip"/>
+            value="wtp-incubator-jaxws-tests-${buildLabel}.zip"/>
         <ant
             antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
             target="unpackUpdateJarsAndCreateZippedPackages">
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
index ad35c59..1f45cda 100644
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
@@ -41,8 +41,15 @@
             target="getAndInstall">
             <param
                 name="groupId"
+                value="dtp"/>
+        </antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
                 value="wtp"/>
         </antcall>
+
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
index c379950..700eaf2 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
@@ -99,10 +99,10 @@
             target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.ws.cfx.tests}" />
+                value="${org.eclipse.jst.cfx.tests}" />
             <param
                 name="report"
-                value="org.eclipse.jst.ws.cfx.tests" />
+                value="org.eclipse.jst.cfx.tests" />
         </antcall>
           	
     </target>