[127409] fix feature versions and labels
diff --git a/assembly/features/org.eclipse.jst.feature/feature.properties b/assembly/features/org.eclipse.jst.feature/feature.properties
index bf877e8..219d61f 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.properties
+++ b/assembly/features/org.eclipse.jst.feature/feature.properties
@@ -1,6 +1,6 @@
-providerName=The Eclipse Foundation
+providerName=Eclipse.org
 
-description=J2EE Standard Tools
+description=J2EE Standard Tools (JST)
 
 license=\
 Eclipse Foundation Software User Agreement\n\
diff --git a/assembly/features/org.eclipse.jst.feature/feature.xml b/assembly/features/org.eclipse.jst.feature/feature.xml
index 287efcb..b4a4d54 100644
--- a/assembly/features/org.eclipse.jst.feature/feature.xml
+++ b/assembly/features/org.eclipse.jst.feature/feature.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.jst"
-      label="J2EE Standard Tools Feature"
-      version="1.0.0"
+      label="J2EE Standard Tools (JST)"
+      version="1.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.jst"
       image="eclipse_update_120.jpg">
-   <install-handler/>
 
    <description>
       %description
@@ -15,6 +15,14 @@
       %license
    </license>
 
+   <url>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Business Intelligence and Reporting Tools (BIRT) Updates" url="http://download.eclipse.org/birt/update-site/"/>
+      <discovery label="Test and Performance Tools Platform (TPTP) Updates" url="http://download.eclipse.org/tptp/updates/"/>
+   </url>
+
+
    <requires>
       <import feature="org.eclipse.wst"/>
    </requires>         
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.properties b/assembly/features/org.eclipse.jst.sdk/feature.properties
index ba2cd69..d2d6593 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.properties
+++ b/assembly/features/org.eclipse.jst.sdk/feature.properties
@@ -1,6 +1,6 @@
-providerName=The Eclipse Foundation
+providerName=Eclipse.org
 
-description=J2EE Standard Tools SDK
+description=J2EE Standard Tools (JST) SDK
 
 license=\
 Eclipse Foundation Software User Agreement\n\
diff --git a/assembly/features/org.eclipse.jst.sdk/feature.xml b/assembly/features/org.eclipse.jst.sdk/feature.xml
index 43ce2fc..56871fa 100644
--- a/assembly/features/org.eclipse.jst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.jst.sdk/feature.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.jst.sdk"
-      label="J2EE Standard Tools Feature and Web Standard Tools Feature SDK"
-      version="1.0.0"
+      label="J2EE Standard Tools (JST) SDK"
+      version="1.0.1.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.jst">
-   <install-handler/>
+      plugin="org.eclipse.jst"
+      image="eclipse_update_120.jpg">
 
    <description>
       %description
@@ -15,6 +15,15 @@
       %license
    </license>
 
+
+   <url>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Business Intelligence and Reporting Tools (BIRT) Updates" url="http://download.eclipse.org/birt/update-site/"/>
+      <discovery label="Test and Performance Tools Platform (TPTP) Updates" url="http://download.eclipse.org/tptp/updates/"/>
+   </url>
+
+
     <includes 	
          id="org.eclipse.jst"
          version="0.0.0"/> 
diff --git a/assembly/features/org.eclipse.wst.feature/feature.xml b/assembly/features/org.eclipse.wst.feature/feature.xml
index 2006061..e7656b3 100644
--- a/assembly/features/org.eclipse.wst.feature/feature.xml
+++ b/assembly/features/org.eclipse.wst.feature/feature.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wst"
-      label="Web Standard Tools (WST)"
+      label="Web Standard Tools (WST) SDK"
       version="1.0.1.qualifier"
       provider-name="%providerName"
+      plugin="org.eclipse.wst"
       image="eclipse_update_120.jpg">
 
    <description>
@@ -15,23 +16,10 @@
    </license>
 
    <url>
-      <update 
-      	label="Web Tools Platform (WTP) Updates" 
-      	url="http://download.eclipse.org/webtools/updates"/>
-
-      <discovery 
-      	label="Web Tools Platform (WTP) Updates" 
-      	url="http://download.eclipse.org/webtools/updates"/>
-      	
-      <discovery 
-      	label="Business Intelligence and Reporting Tools (BIRT) Updates"
-      	url="http://download.eclipse.org/birt/update-site/"/>
-
-      <discovery 
-      	label="Test and Performance Tools Platform (TPTP) Updates"
-      	url="http://download.eclipse.org/tptp/updates/"/>
-
-      		
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Business Intelligence and Reporting Tools (BIRT) Updates" url="http://download.eclipse.org/birt/update-site/"/>
+      <discovery label="Test and Performance Tools Platform (TPTP) Updates" url="http://download.eclipse.org/tptp/updates/"/>
    </url>
 
    <includes
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.properties b/assembly/features/org.eclipse.wst.sdk/feature.properties
index f7c8c30..e361a6e 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.properties
+++ b/assembly/features/org.eclipse.wst.sdk/feature.properties
@@ -1,6 +1,6 @@
-providerName=The Eclipse Foundation
+providerName=Eclipse.org
 
-description=Web Standard Tools SDK
+description=Web Standard Tools (WST) SDK
 
 license=\
 Eclipse Foundation Software User Agreement\n\
diff --git a/assembly/features/org.eclipse.wst.sdk/feature.xml b/assembly/features/org.eclipse.wst.sdk/feature.xml
index d5c3492..1101ca2 100644
--- a/assembly/features/org.eclipse.wst.sdk/feature.xml
+++ b/assembly/features/org.eclipse.wst.sdk/feature.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.wst.sdk"
-      label="Web Standard Tools Feature SDK"
-      version="1.0.0"
-      provider-name="%providerName">
-   <install-handler/>
+      label="SDK for Web Standard Tools (WST)"
+      version="1.0.1.qualifier"
+      provider-name="%providerName"
+      plugin="org.eclipse.wst"
+      image="eclipse_update_120.jpg">
 
    <description>
       %description
@@ -14,7 +15,14 @@
       %license
    </license>
 
-   <includes 	
+   <url>
+      <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
+      <discovery label="Business Intelligence and Reporting Tools (BIRT) Updates" url="http://download.eclipse.org/birt/update-site/"/>
+      <discovery label="Test and Performance Tools Platform (TPTP) Updates" url="http://download.eclipse.org/tptp/updates/"/>
+   </url>
+
+   <includes
          id="org.eclipse.wst"
          version="0.0.0"/>
 
@@ -41,10 +49,9 @@
    <includes
          id="org.eclipse.wst.rdb_sdk.feature"
          version="0.0.0"/>
-         
+
    <includes
          id="org.eclipse.wst.doc.isv.feature"
          version="0.0.0"/>
 
-   
 </feature>