[127409] fix feature versions and labels
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.properties b/features/org.eclipse.wst.xml_core.feature/feature.properties
index 64893f7..7a82f0e 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_core.feature/feature.properties
@@ -20,7 +20,7 @@
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
index 87b9433..09ed076 100644
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wst.xml_core.feature"
-      label="org.eclipse.wst.xml_core.feature"
-      version="1.0.1">
+      label="XML Core Feature"
+      version="1.0.1.qualifier">
 
    <description>
       %description
@@ -13,7 +13,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
    <requires>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
index 5e83e11..ea547d3 100644
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
@@ -23,7 +23,7 @@
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 description=API documentation and source code zips for Eclipse Java development tools.
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
index 87a377d..9b45476 100644
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
 
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.properties b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
index 64893f7..7a82f0e 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
@@ -20,7 +20,7 @@
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
index 9caa46c..84caf16 100644
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
@@ -13,7 +13,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/feature.properties
index 4258d91..8c250e2 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.properties
@@ -15,13 +15,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Source for xml_ui feature plugins
+featureName=XML UI feature plugins
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 description=API documentation and source code zips for Eclipse Java development tools.
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
index ef8b5d0..9fa9b4c 100644
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wst.xml_ui.feature"
-      label="org.eclipse.wst.xml_ui.feature"
+      label="XML UI Feature"
       version="1.0.1.qualifier"
       provider-name="%providerName">
 
@@ -14,7 +14,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
index 4258d91..66ab515 100644
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
@@ -15,13 +15,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Source for xml_ui feature plugins
+featureName=Source for XML UI feature plugins
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 description=API documentation and source code zips for Eclipse Java development tools.
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
index 785e5f6..d894fc9 100644
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
+++ b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
    <includes
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties b/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
index 64893f7..7a82f0e 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
+++ b/features/org.eclipse.wst.xml_userdoc.feature/feature.properties
@@ -20,7 +20,7 @@
 providerName=Eclipse.org
 
 # "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=Web Tools Platform (WTP) Updates
 
 # "description" property - description of the feature
 
diff --git a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
index aef9e20..1ecd81d 100644
--- a/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.xml_userdoc.feature/feature.xml
@@ -14,7 +14,7 @@
    </license>
 
    <url>
-      <update label="Web Tools Project Update Site" url="http://download.eclipse.org/webtools/updates/"/>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
    </url>
 
    <plugin