cleanup
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index a1cc160..43a9ed1 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -250,11 +250,11 @@
             file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst"/>
+                token="@org.eclipse.wtp@"
+                property="org.eclipse.wtp"/>
             <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk"/>
+                token="@org.eclipse.wtp.sdk@"
+                property="org.eclipse.wtp.sdk"/>
             <replacefilter
                 token="@org.eclipse.jst@"
                 property="org.eclipse.jst"/>
@@ -464,20 +464,55 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
+            token="@wtpFile@"
+            value="${wtp.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
+            token="@wtpURL@"
+            value="${wtp.url}/${wtp.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
+            token="@wtpBuildHome@"
+            value="${wtp.build.home}"/>
         <replace
             file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
+            token="@wtp.mirror.prefixuri@"
+            value="${wtp.mirror.prefixuri}"/>
+    	
+        <replace
+            file="${resultingIndex}"
+            token="@jstFile@"
+            value="${jst.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstURL@"
+            value="${jst.url}/${jst.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstBuildHome@"
+            value="${jst.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jst.mirror.prefixuri@"
+            value="${jst.mirror.prefixuri}"/>
+    	
+        <replace
+            file="${resultingIndex}"
+            token="@wtpFile@"
+            value="${wtp.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpURL@"
+            value="${wtp.url}/${wtp.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpBuildHome@"
+            value="${wtp.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtp.mirror.prefixuri@"
+            value="${wtp.mirror.prefixuri}"/>
+    	
         <replace
             file="${resultingIndex}"
             token="@gefFile@"
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index dfbc95e..25cdb29 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -31,6 +31,15 @@
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
 
+$jstURL="@jstURL@";
+$jstFile="@jstFile@";
+$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
+$jstBuildHome="@jstBuildHome@";
+
+$wtpURL="@wtpURL@";
+$wtpFile="@wtpFile@";
+$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
+$wtpBuildHome="@wtpBuildHome@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index a1cc160..43a9ed1 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -250,11 +250,11 @@
             file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
-                token="@org.eclipse.wst@"
-                property="org.eclipse.wst"/>
+                token="@org.eclipse.wtp@"
+                property="org.eclipse.wtp"/>
             <replacefilter
-                token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk"/>
+                token="@org.eclipse.wtp.sdk@"
+                property="org.eclipse.wtp.sdk"/>
             <replacefilter
                 token="@org.eclipse.jst@"
                 property="org.eclipse.jst"/>
@@ -464,20 +464,55 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstFile@"
-            value="${wst.file}"/>
+            token="@wtpFile@"
+            value="${wtp.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstURL@"
-            value="${wst.url}/${wst.file}"/>
+            token="@wtpURL@"
+            value="${wtp.url}/${wtp.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wstBuildHome@"
-            value="${wst.build.home}"/>
+            token="@wtpBuildHome@"
+            value="${wtp.build.home}"/>
         <replace
             file="${resultingIndex}"
-            token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}"/>
+            token="@wtp.mirror.prefixuri@"
+            value="${wtp.mirror.prefixuri}"/>
+    	
+        <replace
+            file="${resultingIndex}"
+            token="@jstFile@"
+            value="${jst.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstURL@"
+            value="${jst.url}/${jst.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstBuildHome@"
+            value="${jst.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jst.mirror.prefixuri@"
+            value="${jst.mirror.prefixuri}"/>
+    	
+        <replace
+            file="${resultingIndex}"
+            token="@wtpFile@"
+            value="${wtp.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpURL@"
+            value="${wtp.url}/${wtp.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpBuildHome@"
+            value="${wtp.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtp.mirror.prefixuri@"
+            value="${wtp.mirror.prefixuri}"/>
+    	
         <replace
             file="${resultingIndex}"
             token="@gefFile@"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
index 1c5b693..e623457 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
@@ -31,6 +31,15 @@
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
 
+$jstURL="@jstURL@";
+$jstFile="@jstFile@";
+$jstMirrorPrefixuri="@jst.mirror.prefixuri@";
+$jstBuildHome="@jstBuildHome@";
+
+$wtpURL="@wtpURL@";
+$wtpFile="@wtpFile@";
+$wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
+$wtpBuildHome="@wtpBuildHome@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";