cleanup
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
index 43a9ed1..a838bcf 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -464,20 +464,20 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
+            token="@wstFile@"
+            value="${wst.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
+            token="@wstURL@"
+            value="${wst.url}/${wst.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
+            token="@wstBuildHome@"
+            value="${wst.build.home}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
+            token="@wst.mirror.prefixuri@"
+            value="${wst.mirror.prefixuri}"/>
     	
         <replace
             file="${resultingIndex}"
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index 43a9ed1..a838bcf 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -464,20 +464,20 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpFile@"
-            value="${wtp.file}"/>
+            token="@wstFile@"
+            value="${wst.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpURL@"
-            value="${wtp.url}/${wtp.file}"/>
+            token="@wstURL@"
+            value="${wst.url}/${wst.file}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtpBuildHome@"
-            value="${wtp.build.home}"/>
+            token="@wstBuildHome@"
+            value="${wst.build.home}"/>
         <replace
             file="${resultingIndex}"
-            token="@wtp.mirror.prefixuri@"
-            value="${wtp.mirror.prefixuri}"/>
+            token="@wst.mirror.prefixuri@"
+            value="${wst.mirror.prefixuri}"/>
     	
         <replace
             file="${resultingIndex}"