cleanup
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index 6ff3e3f..a11696c 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -12,6 +12,10 @@
     default="default">
     <description>script to create a new build component, based on values
         in property file</description>
+    <!--
+        If not otherwise specified by caller, hardcode a property file
+        to use
+    -->
     <property
         name="componentpropertyfile"
         value="xmlsec.properties"/>
diff --git a/releng.wtpbuilder/buildtemplates/buildall.xml b/releng.wtpbuilder/buildtemplates/buildall.xml
new file mode 100644
index 0000000..d2b8904
--- /dev/null
+++ b/releng.wtpbuilder/buildtemplates/buildall.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="project" default="default">
+	<target name="default">
+     <ant>
+      <property
+          name="componentpropertyfile"
+          value="xmlsec.properties"/>
+     </ant>
+     <ant>
+      <property
+          name="componentpropertyfile"
+          value="jaxws.properties"/>
+     </ant>
+	</target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/jaxws.properties b/releng.wtpbuilder/buildtemplates/jaxws.properties
index 655b609..2056e4f 100644
--- a/releng.wtpbuilder/buildtemplates/jaxws.properties
+++ b/releng.wtpbuilder/buildtemplates/jaxws.properties
@@ -28,7 +28,7 @@
 shortname=jaxws
 
 # longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator XML VEX Component.
+longdescription=The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.
 
 # testplugin is the "main" test plugin, which may "call" the others
 testplugin=org.eclipse.jst.ws.cfx.tests
diff --git a/releng.wtpbuilder/buildtemplates/xmlsec.properties b/releng.wtpbuilder/buildtemplates/xmlsec.properties
index babb8d1..9e7fa04 100644
--- a/releng.wtpbuilder/buildtemplates/xmlsec.properties
+++ b/releng.wtpbuilder/buildtemplates/xmlsec.properties
@@ -28,7 +28,7 @@
 shortname=xmlsec
 
 # longdescription appears on the download webpage
-longdescription=The Zip files includes the features and plugins for the WTP Incubator XML VEX Component.
+longdescription=The Zip files includes the features and plugins for the WTP Incubator XML Security Component.
 
 # testplugin is the "main" test plugin, which may "call" the others
 testplugin=org.eclipse.wst.xml.security.core.tests
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index 43a9ed1..a838bcf 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.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/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index 25cdb29..8b40766 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -339,7 +339,7 @@
 
         <tr>
                 <td align="left" valign="top" colspan="5">
-                <p>The Zip files includes the features and plugins for the WTP Incubator XML VEX Component.</p>
+                <p>The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.</p>
                 </td>
         </tr>
         <tr>
@@ -430,7 +430,7 @@
                                         }
                                         else {
                                                // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>
+                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>"
                                                //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
                                         }
 
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 e623457..d079b2b 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
@@ -339,7 +339,7 @@
 
         <tr>
                 <td align="left" valign="top" colspan="5">
-                <p>The Zip files includes the features and plugins for the WTP Incubator XML VEX Component.</p>
+                <p>The Zip files includes the features and plugins for the WTP Incubator XML Security Component.</p>
                 </td>
         </tr>
         <tr>
@@ -430,7 +430,7 @@
                                         }
                                         else {
                                                // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>
+                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>"
                                                //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
                                         }