Fix inconsistent/incorrect bundle name and provider strings.
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties b/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties
index 1c7a24b..512a2af 100644
--- a/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties
+++ b/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
-name=JavaServer Faces Tools (JSF) Project
+name=JSF Tools
 provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project 
+description=Eclipse Web Tools Platform JavaServer Faces Tools 
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
index b152b99..ef86363 100644
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
+++ b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Oracle. - initial API and implementation
 ###############################################################################
-featureName=JavaServer Faces Tools (JSF) Project SDK
+featureName=JSF Tools SDK
 providerName=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project  SDK
+description=Eclipse Web Tools Platform JavaServer Faces Tools SDK
 
 
 
diff --git a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties b/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
index 2b7a864..c555f50 100644
--- a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
+++ b/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
@@ -9,5 +9,5 @@
 # IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.Name=JavaServer Faces Tools
-plugin.Provider=Eclipse.org
\ No newline at end of file
+plugin.Name=JSF Tools
+plugin.Provider=Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jsf.feature/feature.properties b/jsf/features/org.eclipse.jsf.feature/feature.properties
index 492dddc..7f531de 100644
--- a/jsf/features/org.eclipse.jsf.feature/feature.properties
+++ b/jsf/features/org.eclipse.jsf.feature/feature.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
-name=JavaServer Faces Tools (JSF) Project
+name=JSF Tools
 provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project 
+description=Eclipse Web Tools Platform JavaServer Faces Tools 
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
 # license and licenseURL properties were removed as a result to migrating to new PDE license support. 
 #    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism. 
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties b/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties
index 406330e..0bcfdce 100644
--- a/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties
+++ b/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties
@@ -8,9 +8,9 @@
 # Contributors:
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
-name=JavaServer Faces Tools (JSF) Project SDK
+name=JSF Tools SDK
 provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project SDK
+description=Eclipse Web Tools Platform JavaServer Faces Tools SDK
 
 # "updateSiteName" property - label for the update site
 updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties
index d67893b..c8c6bd2 100644
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties
+++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.properties
@@ -15,14 +15,14 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Apache MyFaces Trinidad Tag Support
+featureName=JSF Tools - Tag Library Metadata (Apache Trinidad)
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 
 # "description" property - description of the feature
-description=Apache MyFaces Trinidad Tag Support
+description=Eclipse Web Tools Platform JavaServer Faces Tools - Tag Library Metadata (Apache Trinidad)
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.properties b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.properties
index e00916d..d509a91 100644
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.properties
+++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.properties
@@ -15,14 +15,14 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Apache MyFaces Trinidad Tag Support SDK
+featureName=JSF Tools - Tag Library Metadata (Apache Trinidad) SDK
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 
 # "description" property - description of the feature
-description=Apache MyFaces Trinidad Tag Support SDK
+description=Eclipse Web Tools Platform JavaServer Faces Tools - Tag Library Metadata (Apache Trinidad) SDK
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
index 74d5a4f..866ddc5 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
+++ b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.properties
@@ -15,14 +15,14 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Web Page Editor
+featureName=JSF Tools - Web Page Editor
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 
 # "description" property - description of the feature
-description=Web Page Editor
+description=Eclipse Web Tools Platform JavaServer Faces Tools - Web Page Editor
 # license and licenseURL properties were removed as a result to migrating to new PDE license support. 
 #    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
 
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
index 9646054..db67993 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
+++ b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.properties
@@ -15,14 +15,14 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Web Page Editor SDK
+featureName=JSF Tools - Web Page Editor SDK
 
 # "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
+providerName=Eclipse Web Tools Platform
 
 
 # "description" property - description of the feature
-description=Web Page Editor SDK
+description=Eclipse Web Tools Platform JavaServer Faces Tools - Web Page Editor SDK
 
 # license and licenseURL properties were removed as a result to migrating to new PDE license support. 
 #    Those properties are now added at build time. See http://wiki.eclipse.org/Equinox/p2/License_Mechanism.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/plugin.properties
index 8a7fa94..f783bc4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/plugin.properties
@@ -22,6 +22,5 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = JavaServer Faces Tools - Taglibrary Metadata (Apache Trinidad)
-pluginProvider = Eclipse.org
-
+pluginName=JSF Tools - Tag Library Metadata (Apache Trinidad)
+pluginProvider=Eclipse Web Tools Platform
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties
index 2279dd9..c7efc7f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties
@@ -7,5 +7,5 @@
 #
 ###############################################################################
 #Properties file for org.eclipse.jst.jsf.common.runtime
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JavaServer Faces Tools - Common Runtime
\ No newline at end of file
+Bundle-Name.0=JSF Tools - Common Runtime
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
index 3549ea3..83a595d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
@@ -9,8 +9,8 @@
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
 
-pluginName=JavaServer Faces Tools - Common UI
-pluginProvider=Eclipse.org
+pluginName=JSF Tools - Common UI
+pluginProvider=Eclipse Web Tools Platform
 
 extension-point.name.0 = Introduction Page
 extension-point.name.1 = OverviewPage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties
index b4d063d..6110887 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties
@@ -6,8 +6,8 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 ###############################################################################
-plugin.name=JavaServer Faces Tools - Common
-plugin.provider=Eclipse.org
+plugin.name=JSF Tools - Common
+plugin.provider=Eclipse Web Tools Platform
 
 ###############################################################################
 extension-point.name.0 = annotationFiles
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
index 52e8598..82f8082 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:

 #    Gerry Kessler - initial API and implementation

 ###############################################################################

-plugin.name=JavaServer Faces Tools - Core

-plugin.provider=Eclipse.org

+plugin.name=JSF Tools - Core

+plugin.provider=Eclipse Web Tools Platform

 plugin.facet.name=JavaServer Faces

 plugin.facet.description=Enables the project to be deployed with JSF capabilities.

 

diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
index 5e170e4..8e41624 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
@@ -1,12 +1,13 @@
+Bundle-Name.0=JSF Tools - Facelets Core
+pluginName=JSF Tools - Facelets Core
+providerName=Eclipse Web Tools Platform
+
 plugin.facet.extension.name=Facelet
 plugin.facet.description=Facelet (XHTML) support
 Facelet_1_0_Project=Facelet 1.0 Project
 Facelet_1_0_PresetDesc=Configures a Dynamic Web application for Facelet 1.0, JSF v1.2 using Web Module v2.5 and Java v1.5.  
 
-Bundle-Name.0 = JSF Facelets Tools - WTP Incubator Project
 tagRegistry.description.0 = Facelet Tag Registry
-pluginName = AdditionalTagMetadata Model
-providerName = Eclipse.org
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
 _UI_CreateChild_text3 = {1}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
index 6f38f09..a37da61 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
@@ -1,6 +1,7 @@
+Bundle-Name.0=JSF Tools - Facelets UI
+Bundle-Vendor.0=Eclipse Web Tools Platform
+
 FaceletHTMLValidator_name=Facelet HTML Validator
 EL_Hyperlinkdetector_name=Facelet EL Hyperlink Detector
 FaceletValidatorMarker=Facelet Validator
-Bundle-Name.0 = UI Plug-in
-Bundle-Vendor.0 = Eclipse.org
-extension-point.name = Facelet Validation Override Extension
\ No newline at end of file
+extension-point.name = Facelet Validation Override Extension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
index 04d7109..1abef3c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
@@ -9,8 +9,8 @@
 # Contributors:
 #     Sybase, Inc. - initial API and implementation
 ############################################################################
-plugin.name=JavaServer Faces Tools - FacesConfig Editor
-plugin.provider=Eclipse.org
+plugin.name=JSF Tools - FacesConfig UI
+plugin.provider=Eclipse Web Tools Platform
 
 # Editors
 facesConfigEditor=Faces Config Editor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.properties
index 3bf0208..f197882 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/plugin.properties
@@ -6,8 +6,8 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 ###############################################################################
-plugin.name = JavaServer Faces Tools - FacesConfig Model
-plugin.provider=Eclipse.org
+plugin.name=JSF Tools - FacesConfig Model
+plugin.provider=Eclipse Web Tools Platform
 
 ################
 # Content Type #
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties
index 4ab821a..60d700c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/plugin.properties
@@ -22,6 +22,5 @@
 # %%% END OF TRANSLATED PROPERTIES %%%
 # ====================================================================
 
-pluginName = JavaServer Faces Tools - Taglibrary Metadata
-pluginProvider = Eclipse.org
-
+pluginName=JSF Tools - Tag Library Metadata (Standard)
+pluginProvider=Eclipse Web Tools Platform
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties
index f31e526..7f69a9b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/plugin.properties
@@ -8,8 +8,9 @@
 # Contributors:
 #    Gerry Kessler - initial API and implementation
 ###############################################################################
-plugin.name=JavaServer Faces Tools - UI
-plugin.provider=Eclipse.org
+plugin.name=JSF Tools - UI
+plugin.provider=Eclipse Web Tools Platform
+
 EL_Hyperlinkdetector_name=JSP EL Hyperlink Detector
 
 jsf.library.reference=JSF Library References
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
index 5f40d6e..209ca11 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
@@ -11,5 +11,5 @@
 ####################################################
 # Plugin XML information.
 ####################################################
-pluginName=JavaServer Faces Tools - Pagedesigner UI
-providerName=Eclipse.org
+pluginName=JSF Tools - Web Page Editor (JSF UI)
+providerName=Eclipse Web Tools Platform
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
index 3c3f9a1..2b656df 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
@@ -11,7 +11,7 @@
 ####################################################
 # Plugin XML information.
 ####################################################
-pluginName=JavaServer Faces Tools - JSP Core Pagedesigner
-providerName=Eclipse.org
+pluginName=JSF Tools - Web Page Editor (JSP Core)
+providerName=Eclipse Web Tools Platform
 
 extension-point.name.0 = page variable
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
index 46d2298..2077ad3 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.properties
@@ -11,8 +11,8 @@
 ####################################################
 # Plugin XML information.
 ####################################################
-pluginName=JavaServer Faces Tools - Web Page Editor
-providerName=Eclipse.org
+pluginName=JSF Tools - Web Page Editor
+providerName=Eclipse Web Tools Platform
 
 editor.binding.context.name=Using Web Page Editor
 editor.binding.context.description=Key binding context when using the web page editor