diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties
index 49cc2bc..e06eca4 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.properties
@@ -1,37 +1,37 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Gerry Kessler - initial API and implementation
-###############################################################################
-name=JSF Tooling Tests Feature
-provider=Eclipse Web Tools Platform
-description=JSF Tooling for WTP Automated Tests
-# 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.
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle Corporation.\
-All rights reserved. This program and the accompanying materials\
-are made available under the terms of the Eclipse Public License v1.0\
-which accompanies this distribution, and is available at\
-http://www.eclipse.org/legal/epl-v10.html\
-\n\
-Contributors:\n\
-    Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-# 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. 
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-# 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. 
-########### end of license property ##########################################
+###############################################################################
+# Copyright (c) 2005 Oracle Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#    Gerry Kessler - initial API and implementation
+###############################################################################
+name=JSF Tools - Tests
+provider=Eclipse Web Tools Platform
+description=Eclipse Web Tools Platform JavaServer Faces Tools - Tests
+# 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.
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 Oracle Corporation.\
+All rights reserved. This program and the accompanying materials\
+are made available under the terms of the Eclipse Public License v1.0\
+which accompanies this distribution, and is available at\
+http://www.eclipse.org/legal/epl-v10.html\
+\n\
+Contributors:\n\
+    Oracle Corporation - initial API and implementation\n
+################ end of copyright property ####################################
+
+# "licenseURL" property - URL of the "Feature License"
+# do not translate value - just change to point to a locale-specific HTML page
+# 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. 
+
+# "license" property - text of the "Feature Update License"
+# should be plain text version of license agreement pointed to be "licenseURL"
+# 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. 
+########### end of license property ##########################################
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF
index 2daea7a..ca77cb8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Runtime Test Plugin
+Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.common.runtime.tests
 Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.common.runtime.tests.RuntimeTestPlugin
@@ -11,3 +11,5 @@
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.jst.jsf.common.runtime.tests.model
+Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Localization: plugin
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/plugin.properties
new file mode 100644
index 0000000..cd74c22
--- /dev/null
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/plugin.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2008 Oracle Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+###############################################################################
+#Properties file for org.eclipse.jst.jsf.common.runtime.tests
+Bundle-Name.0=JSF Tools - Common Runtime Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties
index ceb11e8..eb795cc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=JavaServer Faces Tools - Contentassist Tests Plug-in
-Bundle-Vendor.0=Eclipse.org
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Name.0=JSF Tools - Content Assist Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties
index a584e7e..f09a2f8 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/plugin.properties
@@ -1,27 +1,27 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName=JavaServer Faces Tools - Context Symbol Tests
-providerName=Eclipse.org
-
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+
+
+# ====================================================================
+# To code developer:
+#   Do NOT change the properties between this line and the
+#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
+#   Make a new property name, append to the end of the file and change
+#   the code to use the new property.
+# ====================================================================
+
+# ====================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# ====================================================================
+
+pluginName=JSF Tools - Context Symbol Tests
+providerName=Eclipse Web Tools Platform
+
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.core.tests/plugin.properties
index 0691ded..777c7fb 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/plugin.properties
@@ -1,15 +1,15 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-jsfLibrary.label.0 = FAKE LIB FROM jsf.core.tests (1)
-jsfLibrary.label.1 = FAKE LIB FROM jsf.core.tests (2)
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JavaServer Faces Tools - Core Tests Plug-in
\ No newline at end of file
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+Bundle-Name.0=JSF Tools - Core Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
+
+jsfLibrary.label.0 = FAKE LIB FROM jsf.core.tests (1)
+jsfLibrary.label.1 = FAKE LIB FROM jsf.core.tests (2)
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties
index 0e3cd99..16384dc 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=JavaServer Faces Tools - DesignTime Tests Plug-in
-Bundle-Vendor.0=Eclipse.org
\ No newline at end of file
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Name.0=JSF Tools - Design-Time Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/plugin.properties
index c860c63..c015732 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/plugin.properties
@@ -7,5 +7,5 @@
 #
 ###############################################################################
 # Properties for the faces config test plugin
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JavaServer Faces Tools - FacesConfig Tests Plug-in
\ No newline at end of file
+Bundle-Name.0=JSF Tools - FacesConfig Model Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
index 7874f1a..d9e5aaf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 2.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.f0
+Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig.ui.test
 Bundle-Version: 1.3.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.f0
+Bundle-Vendor: %plugin.provider
 Fragment-Host: org.eclipse.jst.jsf.facesconfig.ui;bundle-version="[1.0.0,2.0.0)"
 Bundle-Localization: plugin
 Require-Bundle: org.junit;bundle-version="3.8.1",
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties
index 31a8f76..9f8477a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
 
-Bundle-Vendor.f0=Eclipse.org
-Bundle-Name.f0=JavaServer Faces Tools - FacesConfig UI Test Fragment
+plugin.name=JSF Tools - FacesConfig UI Tests
+plugin.provider=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties
index b01168d..6371461 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0 = JavaServer Faces Tools - Metadata Tests Plug-in
-Bundle-Vendor.0=Eclipse.org
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Name.0=JSF Tools - Metadata Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties
index 5240b5a..f18aa54 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
 
-Bundle-Name.0 = JavaServer Faces Tools - MetadataprocessingTests2 Plug-in
-Bundle-Vendor.0=Eclipse.org
\ No newline at end of file
+Bundle-Name.0=JSF Tools - Metadata Processing Tests 2
+Bundle-Vendor.0=Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.test.util/plugin.properties
index 4e06943..85810e0 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
 
-Bundle-Name.0=JavaServer Faces Tools - JUnit Tests Util Plug-in
-Bundle-Vendor.0=Eclipse.org
+Bundle-Name.0=JSF Tools - JUnit Tests Utilities
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.ui.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.ui.tests/plugin.properties
index 99ad0ba..69caa35 100644
--- a/jsf/tests/org.eclipse.jst.jsf.ui.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.ui.tests/plugin.properties
@@ -9,5 +9,5 @@
 #     Oracle Corporation - initial API and implementation
 ###############################################################################
 
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JavaServer Faces Tools - UI Tests Plug-in
\ No newline at end of file
+Bundle-Name.0=JSF Tools - UI Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/plugin.properties b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/plugin.properties
index 2c1d04e..0f23125 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/plugin.properties
@@ -1,11 +1,11 @@
-###############################################################################
-# Copyright (c) 2007 Oracle Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-Bundle-Name.0 = JavaServer Faces Tools - Validation EL Tests Plug-in
-Bundle-Vendor.0 = Eclipse.org
+###############################################################################
+# Copyright (c) 2007 Oracle Corporation.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+###############################################################################
+
+Bundle-Name.0=JSF Tools - Validation EL Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/plugin.properties b/jsf/tests/org.eclipse.jst.pagedesigner.tests/plugin.properties
index 2595a80..3c83f59 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/plugin.properties
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/plugin.properties
@@ -1,13 +1,13 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Oracle Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Name.0=JavaServer Faces Tools - Web Page Editor Tests Plug-in
-Bundle-Vendor.0=Eclipse.org
+###############################################################################
+# Copyright (c) 2001, 2007 Oracle Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     Oracle Corporation - initial API and implementation
+###############################################################################
+
+Bundle-Name.0=JSF Tools - Web Page Editor Tests
+Bundle-Vendor.0=Eclipse Web Tools Platform