diff --git a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
index c52d64cc956..c3b504355ab 100644
--- a/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.rse.discovery/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Service Discovery RSE Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.discovery;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.rse.discovery.Activator
@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tm.discovery.wizard,
  org.eclipse.tm.discovery.model
 Eclipse-LazyStart: true
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.rse.discovery/build.properties b/discovery/org.eclipse.rse.discovery/build.properties
index 34d2e4d2dad..ae5c58b1e92 100644
--- a/discovery/org.eclipse.rse.discovery/build.properties
+++ b/discovery/org.eclipse.rse.discovery/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               about.html,\
+               plugin.properties,\
                .
diff --git a/discovery/org.eclipse.rse.discovery/plugin.properties b/discovery/org.eclipse.rse.discovery/plugin.properties
new file mode 100644
index 00000000000..f02bb4ad437
--- /dev/null
+++ b/discovery/org.eclipse.rse.discovery/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = Service Discovery RSE Plug-in
+providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
index 1b91165ac1a..3105327a996 100644
--- a/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.engine/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Service Discovery Engine Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.engine;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.tm.discovery.engine.Activator
@@ -15,4 +15,4 @@ Export-Package: org.eclipse.tm.discovery.engine,
  org.eclipse.tm.discovery.transport
 Import-Package: org.eclipse.tm.discovery.model,
  org.eclipse.tm.discovery.model.util
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.tm.discovery.engine/build.properties b/discovery/org.eclipse.tm.discovery.engine/build.properties
index 101ae799c1e..5d64794d2a7 100644
--- a/discovery/org.eclipse.tm.discovery.engine/build.properties
+++ b/discovery/org.eclipse.tm.discovery.engine/build.properties
@@ -1,7 +1,8 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                about.html,\
-               plugin.xml
+               plugin.properties,\
+               plugin.xml,\
+               .
 src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.engine/plugin.properties b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
new file mode 100644
index 00000000000..3f2459eab7a
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.engine/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = Service Discovery Engine Plug-in
+providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/build.properties b/discovery/org.eclipse.tm.discovery.model.edit/build.properties
index 3c9f12b2fd8..7589e9c22bc 100644
--- a/discovery/org.eclipse.tm.discovery.model.edit/build.properties
+++ b/discovery/org.eclipse.tm.discovery.model.edit/build.properties
@@ -1,14 +1,14 @@
 # <copyright>
 # </copyright>
 #
-# $Id$
+# $Id: build.properties,v 1.1 2006/09/07 11:57:27 jmontalvo Exp $
 
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
+bin.includes = META-INF/,\
+               about.html,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               icons/,\
+               .
 jars.compile.order = .
 source.. = src/
 output.. = bin/
diff --git a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
index e9d74051f0e..75fdf4f4108 100644
--- a/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.model.edit/plugin.properties
@@ -22,7 +22,7 @@
 # ====================================================================
 
 pluginName = Service Discovery Edit Support
-providerName = Symbian
+providerName = Eclipse.org
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
index 5246907c275..4a061a92405 100644
--- a/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.model/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.tm.discovery.model,
  org.eclipse.tm.discovery.model.impl,
  org.eclipse.tm.discovery.model.util
+Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.tm.discovery.model/build.properties b/discovery/org.eclipse.tm.discovery.model/build.properties
index d601194980a..7f2bf418732 100644
--- a/discovery/org.eclipse.tm.discovery.model/build.properties
+++ b/discovery/org.eclipse.tm.discovery.model/build.properties
@@ -1,6 +1,7 @@
 source.. = src/
 bin.includes = META-INF/,\
-               .,\
+               about.html,\
+               plugin.properties,\
                src/,\
-               about.html
+               .
 src.includes = about.html
diff --git a/discovery/org.eclipse.tm.discovery.model/plugin.properties b/discovery/org.eclipse.tm.discovery.model/plugin.properties
index fb100bbc7b8..aee76c0ff2c 100644
--- a/discovery/org.eclipse.tm.discovery.model/plugin.properties
+++ b/discovery/org.eclipse.tm.discovery.model/plugin.properties
@@ -22,5 +22,5 @@
 # ====================================================================
 
 pluginName = Service Discovery Model
-providerName = Symbian
+providerName = Eclipse.org
 
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
index d89e5991b8a..d3a67637198 100644
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DNS Service Discovery Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.protocol.dnssd;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.tm.discovery.protocol.dnssd.Activator
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
index 34d2e4d2dad..ae5c58b1e92 100644
--- a/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               about.html,\
+               plugin.properties,\
                .
diff --git a/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
new file mode 100644
index 00000000000..36e8ff66ade
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.protocol.dnssd/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = DNS Service Discovery Plug-in
+providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
index 21871043d3d..d1caf8dd1ec 100644
--- a/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.transport.udp/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: UDP Transport Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.transport.udp;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.tm.discovery.transport.udp.Activator
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/build.properties b/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
index 34d2e4d2dad..ae5c58b1e92 100644
--- a/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
+++ b/discovery/org.eclipse.tm.discovery.transport.udp/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               about.html,\
+               plugin.properties,\
                .
diff --git a/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
new file mode 100644
index 00000000000..078f5031c8f
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.transport.udp/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = UDP Transport Plug-in
+providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
index ad827e44d00..3c421f8c3f0 100644
--- a/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.view/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Service Discovery View Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.view;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.tm.discovery.view.Activator
@@ -21,4 +21,4 @@ Import-Package: org.eclipse.emf.common.ui,
  org.eclipse.tm.discovery.model.provider,
  org.eclipse.tm.discovery.model.util
 Export-Package: org.eclipse.tm.discovery.view
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.tm.discovery.view/build.properties b/discovery/org.eclipse.tm.discovery.view/build.properties
index 7f02c0aadd1..2b39871ca5f 100644
--- a/discovery/org.eclipse.tm.discovery.view/build.properties
+++ b/discovery/org.eclipse.tm.discovery.view/build.properties
@@ -1,9 +1,10 @@
 source.. = src/
 output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
+bin.includes = META-INF/,\
+               about.html,\
+               plugin.properties,\
+               plugin.xml,\
                icons/,\
-               about.html
+               .
 src.includes = about.html
                
diff --git a/discovery/org.eclipse.tm.discovery.view/plugin.properties b/discovery/org.eclipse.tm.discovery.view/plugin.properties
new file mode 100644
index 00000000000..b6005710f41
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.view/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = Service Discovery View Plug-in
+providerName = Eclipse.org
diff --git a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
index 7555e408128..cbb65748ae3 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
+++ b/discovery/org.eclipse.tm.discovery.wizard/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Service Discovery Wizard Pages Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.discovery.wizard
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.tm.discovery.wizard.Activator
@@ -14,4 +14,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.tm.discovery.model.edit
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.tm.discovery.wizard
-Bundle-Vendor: Symbian
+Bundle-Vendor: %providerName
diff --git a/discovery/org.eclipse.tm.discovery.wizard/build.properties b/discovery/org.eclipse.tm.discovery.wizard/build.properties
index 34d2e4d2dad..ae5c58b1e92 100644
--- a/discovery/org.eclipse.tm.discovery.wizard/build.properties
+++ b/discovery/org.eclipse.tm.discovery.wizard/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               about.html,\
+               plugin.properties,\
                .
diff --git a/discovery/org.eclipse.tm.discovery.wizard/plugin.properties b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
new file mode 100644
index 00000000000..46f58bddd5c
--- /dev/null
+++ b/discovery/org.eclipse.tm.discovery.wizard/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = Service Discovery Wizard Pages Plug-in
+providerName = Eclipse.org
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
index c25a8e76482..9c61fc2db62 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.daytime/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.examples.daytime;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.examples.daytime.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.rse.subsystems.files.ftp,
  org.eclipse.rse.ui,
diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
index 28757a5a1b7..1c0d424a7a5 100644
--- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
+++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.properties
@@ -9,7 +9,8 @@
 # Martin Oberhuber (Wind River) - initial API and implementation 
 ################################################################################
 
-plugin.name = RSE Daytime
+pluginName = RSE Daytime
+providerName = Eclipse.org
 
 FTPDaytimeSystemDescription=FTP and Daytime Connection Type
 
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
index 87ed1d31311..e0687ef917b 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: RSE Tutorial Examples
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.examples.tutorial;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: samples.RSESamplesPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/build.properties b/rse/examples/org.eclipse.rse.examples.tutorial/build.properties
index fab37abedf2..e8eb717bc87 100644
--- a/rse/examples/org.eclipse.rse.examples.tutorial/build.properties
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/build.properties
@@ -14,6 +14,7 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                icons/,\
+               plugin.properties,\
                plugin.xml,\
                rseSamplesMessages.xml
 src.includes = META-INF/,\
diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties
new file mode 100644
index 00000000000..c6a36e8595f
--- /dev/null
+++ b/rse/examples/org.eclipse.rse.examples.tutorial/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = RSE Tutorial Examples
+providerName = Eclipse.org
diff --git a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
index a0cfaf091b7..e7ac8e78cca 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
+++ b/rse/examples/org.eclipse.rse.remotecdt/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Remote CDT Plug-in
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.remotecdt;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.remotecdt.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
@@ -26,4 +26,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.core,
  org.eclipse.rse.subsystems.files.core
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/examples/org.eclipse.rse.remotecdt/build.properties b/rse/examples/org.eclipse.rse.remotecdt/build.properties
index 54edfbd4dc5..eb805ac6c34 100644
--- a/rse/examples/org.eclipse.rse.remotecdt/build.properties
+++ b/rse/examples/org.eclipse.rse.remotecdt/build.properties
@@ -1,10 +1,11 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                about.html,\
+               plugin.properties,\
+               plugin.xml,\
                icons/,\
-               plugin.xml
+               .
 src.includes = META-INF/,\
                about.html,\
                icons/,\
diff --git a/rse/examples/org.eclipse.rse.remotecdt/plugin.properties b/rse/examples/org.eclipse.rse.remotecdt/plugin.properties
new file mode 100644
index 00000000000..a4fcef4e474
--- /dev/null
+++ b/rse/examples/org.eclipse.rse.remotecdt/plugin.properties
@@ -0,0 +1,13 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = Remote CDT Plug-in
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
index 510c42d7a5f..1c00dbab245 100644
--- a/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dstore.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dstore.core.Activator
@@ -18,4 +18,4 @@ Export-Package: org.eclipse.dstore.core,
  org.eclipse.dstore.core.server,
  org.eclipse.dstore.core.util,
  org.eclipse.dstore.core.util.ssl
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.dstore.core/plugin.properties b/rse/plugins/org.eclipse.dstore.core/plugin.properties
index c8c9c63a2cc..67dd95a23a0 100644
--- a/rse/plugins/org.eclipse.dstore.core/plugin.properties
+++ b/rse/plugins/org.eclipse.dstore.core/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Dstore Core
+pluginName = RSE Dstore Core
+providerName = Eclipse.org
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
index 26e0d62906b..b00a6519aa4 100644
--- a/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.dstore.extra/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.dstore.extra
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.dstore.extra.Activator
@@ -10,4 +10,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.dstore.extra.internal.extra
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.dstore.extra/plugin.properties b/rse/plugins/org.eclipse.dstore.extra/plugin.properties
index 811c3349f67..f6e5eb5fb4f 100644
--- a/rse/plugins/org.eclipse.dstore.extra/plugin.properties
+++ b/rse/plugins/org.eclipse.dstore.extra/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Dstore Platform Support
\ No newline at end of file
+pluginName = RSE Dstore Platform Support
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
index 74a01b134f2..c9814493996 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.dstore
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.connectorservice.dstore.Activator
@@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.ui,
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.dstore,
  org.eclipse.rse.connectorservice.dstore.util
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
index 92c2e030acb..55eaf7f23f3 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Dstore Connector Service
\ No newline at end of file
+pluginName = RSE Dstore Connector Service
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
index 0fe8ef2e4bf..8041c071665 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.connectorservice.local
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.connectorservice.local.Activator
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.connectorservice.local
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties b/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties
index 1edaf33afe1..862bdb0c3b5 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.connectorservice.local/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Local Connector Service
\ No newline at end of file
+pluginName = RSE Local Connector Service
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
index 247ae637aa6..89c863fbce1 100644
--- a/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.core.RSECorePlugin
@@ -19,4 +19,4 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.internal.references,
  org.eclipse.rse.persistence,
  org.eclipse.rse.persistence.dom
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.core/plugin.properties b/rse/plugins/org.eclipse.rse.core/plugin.properties
index 3596ca495da..568390d94ce 100644
--- a/rse/plugins/org.eclipse.rse.core/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.core/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Core
\ No newline at end of file
+pluginName = RSE Core
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
index 462fcfb05e1..b44db145414 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.dstore.security/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.dstore.security; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.dstore.security.UniversalSecurityPlugin
@@ -18,4 +18,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.subsystems.shells.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.dstore.security/plugin.properties b/rse/plugins/org.eclipse.rse.dstore.security/plugin.properties
index 4481bef6266..77f42a50969 100644
--- a/rse/plugins/org.eclipse.rse.dstore.security/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.dstore.security/plugin.properties
@@ -16,7 +16,8 @@
 
 # NLS_MESSAGEFORMAT_VAR
 
-plugin.name = RSE Dstore SSL Support
+pluginName = RSE Dstore SSL Support
+providerName = Eclipse.org
 
 KeystoreProviderName = Universal Keystore Provider
 PreferencePage.SSL = SSL
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
index d793e9cc69a..b4a78c2176e 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.eclipse.filesystem; singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.eclipse.filesystem.Activator
@@ -16,4 +16,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.rse.core
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.properties b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.properties
index 0e25d533969..4241f9bc4f0 100644
--- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.properties
@@ -16,4 +16,5 @@
 
 # NLS_MESSAGEFORMAT_VAR
 
-plugin.name = RSE EFS Support
+pluginName = RSE EFS Support
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
index 298a1f74c0b..78d977eeccc 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.files.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.files.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.files.ui.Activator
@@ -31,4 +31,4 @@ Export-Package: org.eclipse.rse.files.ui,
  org.eclipse.rse.files.ui.view,
  org.eclipse.rse.files.ui.widgets,
  org.eclipse.rse.files.ui.wizards
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.files.ui/plugin.properties b/rse/plugins/org.eclipse.rse.files.ui/plugin.properties
index 6639a841c11..326ef0157d6 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.files.ui/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Files UI
+pluginName = RSE Files UI
+providerName = Eclipse.org
 
 PreferencePage.UniversalFiles = Files
 PreferencePage.Cache = File Cache
diff --git a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
index b4b50377adf..f3f6b1cd257 100644
--- a/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.logging/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.logging;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.logging.RemoteSystemsLoggingPlugin
@@ -11,4 +11,4 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.logging,
  org.eclipse.rse.logging.performance,
  org.eclipse.rse.logging.ui
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.logging/plugin.properties b/rse/plugins/org.eclipse.rse.logging/plugin.properties
index 895b4fc982e..1b418561e7d 100644
--- a/rse/plugins/org.eclipse.rse.logging/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.logging/plugin.properties
@@ -20,7 +20,8 @@
 
 # NLS_MESSAGEFORMAT_VAR
 
-plugin.name = RSE Logging
+pluginName = RSE Logging
+providerName = Eclipse.org
 
 Remote_Systems_Logging = Remote Systems Logging
 
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
index 65f0e00812c..19f94e43078 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.processes.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.processes.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.processes.ui.ProcessesPlugin
@@ -32,4 +32,4 @@ Export-Package: org.eclipse.rse.processes.ui,
  org.eclipse.rse.processes.ui.propertypages,
  org.eclipse.rse.processes.ui.view
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties b/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties
index ffdc89c29bc..70469b10e51 100644
--- a/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.processes.ui/plugin.properties
@@ -16,7 +16,8 @@
 
 # NLS_MESSAGEFORMAT_VAR
 
-plugin.name = RSE Processes UI
+pluginName = RSE Processes UI
+providerName = Eclipse.org
 
 Factory.LocalProcesses = Local Processes
 PropertyPage.ServerLauncherSettings = Server Launcher Settings
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
index bb5cb5aab8e..4b6c1cb9db2 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.dstore/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.dstore
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.dstore.Activator
@@ -24,4 +24,4 @@ Export-Package: org.eclipse.rse.dstore.universal.miners,
  org.eclipse.rse.services.dstore.search,
  org.eclipse.rse.services.dstore.shells,
  org.eclipse.rse.services.dstore.util
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
index ff0b04b8e05..9bd918a375d 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.dstore/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Dstore Services
\ No newline at end of file
+pluginName = RSE Dstore Services
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index 36270dc042d..2252e159318 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.files.ftp
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.files.ftp.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties b/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
index b928cbf8445..3697ec741cd 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE FTP services
\ No newline at end of file
+pluginName = RSE FTP services
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
index f6ac343a42d..c51774e6268 100644
--- a/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.local/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services.local;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.local.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services
diff --git a/rse/plugins/org.eclipse.rse.services.local/plugin.properties b/rse/plugins/org.eclipse.rse.services.local/plugin.properties
index 6b0e52b6cba..fc6669d111c 100644
--- a/rse/plugins/org.eclipse.rse.services.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services.local/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Local Services
\ No newline at end of file
+pluginName = RSE Local Services
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
index aa28e323493..f46b0d8b1d5 100644
--- a/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.services
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.services.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
 Eclipse-LazyStart: true
diff --git a/rse/plugins/org.eclipse.rse.services/plugin.properties b/rse/plugins/org.eclipse.rse.services/plugin.properties
index a5a3f218261..70b15f25383 100644
--- a/rse/plugins/org.eclipse.rse.services/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.services/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Services Framework
+pluginName = RSE Services Framework
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
index 341f4399cff..44a3da1f81a 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.shells.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.shells.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.shells.ui.Activator
@@ -26,4 +26,4 @@ Export-Package: org.eclipse.rse.shells.ui,
  org.eclipse.rse.shells.ui.actions,
  org.eclipse.rse.shells.ui.propertypages,
  org.eclipse.rse.shells.ui.view
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties b/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
index a6ed7adb298..4d4ce035d93 100644
--- a/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.shells.ui/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Shells UI
+pluginName = RSE Shells UI
+providerName = Eclipse.org
 
 View.Commands = Commands
 View.RemoteCommands = Remote Shell
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
index f572e0b59db..3f918dbecee 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.core.Activator
@@ -18,4 +18,4 @@ Export-Package: org.eclipse.rse.internal.subsystems.files.core,
  org.eclipse.rse.subsystems.files.core.servicesubsystem,
  org.eclipse.rse.subsystems.files.core.subsystems,
  org.eclipse.rse.subsystems.files.core.util
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.core/plugin.properties
index 7cad38f347a..43b95a397b7 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Files Core
+pluginName = RSE Files Core
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
index 682bc670148..e29d74c687e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.dstore;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.dstore.Activator
@@ -20,4 +20,4 @@ Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.subsystems.files.dstore,
  org.eclipse.rse.subsystems.files.dstore.model,
  org.eclipse.rse.subsystems.files.dstore.subsystem
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.properties
index 7e62f08f6b4..bd8758576f3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Dstore Files
+pluginName = RSE Dstore Files
+providerName = Eclipse.org
 
 Files=Files
 FilesDescription=This configuration allows you to work with files on local or remote systems using the DataStore protocol.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
index 6cbcb32ae1a..f26cab1dfd4 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.ftp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.ftp.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
index 84b4a821067..09a7eccf77d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ftp/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE FTP Files
+pluginName = RSE FTP Files
+providerName = Eclipse.org
 
 Files=Files
 FilesDescription=This configuration allows you to work with files on local or remote systems using the FTP protocol.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
index 7522f442442..62dd8bf3145 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.files.local;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.files.local.Activator
@@ -15,6 +15,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.subsystems.files.local,
  org.eclipse.rse.subsystems.files.local.model
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.properties
index fe74c42c798..2e51fbe4742 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Local Files
+pluginName = RSE Local Files
+providerName = Eclipse.org
 
 Files=Local Files
 FilesDescription=This configuration allows you to work with files on the local system and doesn't require any communication server to be running.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
index 1ffc1bc0f92..63ecd251d41 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.rse.subsystems.processes.core,
  org.eclipse.rse.subsystems.processes.core.subsystem,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.core/plugin.properties
index a5b989a82d3..c7956888c60 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Processes Core
+pluginName = RSE Processes Core
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
index 792655bec6e..b406cf1b986 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.dstore;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.processes.dstore.Activator
@@ -17,4 +17,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.properties
index c42f176b75a..395447df1fc 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Dstore Processes
+pluginName = RSE Dstore Processes
+providerName = Eclipse.org
 
 Processes=Processes
 ProcessesDescription=This configuration allows you to work with processes on local or remote systems using the DataStore protocol.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
index 7872c198430..6039e74f6e0 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.processes.local;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.processes.local.Activator
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.core,
  org.eclipse.rse.ui
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.subsystems.processes.local
diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties
index 4b64bcf712d..0dbfee09047 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/plugin.properties
@@ -14,6 +14,7 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Local Processes
+pluginName = RSE Local Processes
+providerName = Eclipse.org
 
 Processes=Processes
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
index 2ccbdd290d8..1a5bb58cfee 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.core.Activator
@@ -19,4 +19,4 @@ Export-Package: org.eclipse.rse.internal.subsystems.shells.servicesubsystem,
  org.eclipse.rse.subsystems.shells.core.model,
  org.eclipse.rse.subsystems.shells.core.subsystems,
  org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
index bf04fa2c2e7..4508014a738 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/plugin.properties
@@ -9,4 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE Shells Core
+pluginName = RSE Shells Core
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index a5be44bf845..445b41810c7 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.dstore;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.dstore.Activator
@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui,
  org.eclipse.rse.subsystems.files.core
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.subsystems.shells.dstore,
  org.eclipse.rse.subsystems.shells.dstore.model
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
index e0345f64bba..80dcb160f38 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Dstore Shells
+pluginName = RSE Dstore Shells
+providerName = Eclipse.org
 
 Shells=Shells
 ShellsDescription=This configuration allows you to work with shells and commands on local or remote systems using the DataStore protocol.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index d1920d6b176..32e961d2535 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.local;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.subsystems.shells.local.Activator
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.rse.ui,
  org.eclipse.rse.subsystems.files.core
 Eclipse-LazyStart: true
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Export-Package: org.eclipse.rse.subsystems.shells.local
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
index c054558a7f9..1ed70df4a8c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/plugin.properties
@@ -14,7 +14,8 @@
 # {Name} (company) - description of contribution.
 ################################################################################
 
-plugin.name = RSE Local Shells
+pluginName = RSE Local Shells
+providerName = Eclipse.org
 
 Shells=Local Shells
 ShellsDescription=This configuration allows you to work with shells and commands on the local system and doesn't require any communication server to be running.
\ No newline at end of file
diff --git a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
index c2f4b0c2d8e..e526eff23c5 100644
--- a/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.ui;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.rse.ui.RSEUIPlugin
@@ -47,4 +47,4 @@ Export-Package: org.eclipse.rse.core,
  org.eclipse.rse.ui.widgets,
  org.eclipse.rse.ui.widgets.services,
  org.eclipse.rse.ui.wizards
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties
index b2596cc1c64..3eb167feeb7 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties
@@ -16,7 +16,8 @@
 
 # NLS_MESSAGEFORMAT_VAR
 
-plugin.name = RSE UI
+pluginName = RSE UI
+providerName = Eclipse.org
 
 extPoint.subsystemConfigurationss = Remote Subsystem Configurations
 extPoint.popupMenus = Remote Object Popup Menu Actions
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
index 78f276e3984..e91d194d0a1 100755
--- a/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RSE Test Framework Example
-Bundle-SymbolicName: org.eclipse.rse.examples.testframework;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Require-Bundle: org.junit,
- org.eclipse.rse.tests.framework
-Eclipse-LazyStart: true
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rse.examples.testframework;singleton:=true
+Bundle-Version: 1.0.0
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Require-Bundle: org.junit,
+ org.eclipse.rse.tests.framework
+Eclipse-LazyStart: true
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/build.properties b/rse/tests/org.eclipse.rse.tests.framework.examples/build.properties
index eb4b5d31354..8e2806dfb58 100755
--- a/rse/tests/org.eclipse.rse.tests.framework.examples/build.properties
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/build.properties
@@ -1,6 +1,7 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               plugin.xml,\
-               META-INF/,\
-               scripts/
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               plugin.properties,\
+               plugin.xml,\
+               scripts/,\
+               .
diff --git a/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.properties b/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.properties
new file mode 100644
index 00000000000..b40665e5e08
--- /dev/null
+++ b/rse/tests/org.eclipse.rse.tests.framework.examples/plugin.properties
@@ -0,0 +1,14 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = RSE Test Framework Examples
+providerName = Eclipse.org
+ 
\ No newline at end of file
diff --git a/rse/tests/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF b/rse/tests/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF
index 50c5984a6c0..ac4ea4a2f5a 100644
--- a/rse/tests/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF
+++ b/rse/tests/org.eclipse.rse.tests.framework/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: RSE Test Framework
-Bundle-SymbolicName: org.eclipse.rse.tests.framework;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.rse.tests.framework.TestFrameworkPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.rse.tests.framework,
- org.eclipse.rse.tests.framework.scripting
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.help,
- org.eclipse.core.resources,
- org.junit
-Eclipse-LazyStart: true
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rse.tests.framework;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.rse.tests.framework.TestFrameworkPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.rse.tests.framework,
+ org.eclipse.rse.tests.framework.scripting
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.jface.text,
+ org.eclipse.help,
+ org.eclipse.core.resources,
+ org.junit
+Eclipse-LazyStart: true
diff --git a/rse/tests/org.eclipse.rse.tests.framework/build.properties b/rse/tests/org.eclipse.rse.tests.framework/build.properties
index 0bd0937cb78..426f288715d 100644
--- a/rse/tests/org.eclipse.rse.tests.framework/build.properties
+++ b/rse/tests/org.eclipse.rse.tests.framework/build.properties
@@ -1,9 +1,11 @@
-bin.includes = .,\
-               plugin.xml,\
-               toc.xml,\
-               html/,\
-               icons/,\
-               schema/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
+bin.includes = META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               toc.xml,\
+               html/,\
+               icons/,\
+               schema/,\
+               .
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/rse/tests/org.eclipse.rse.tests.framework/plugin.properties b/rse/tests/org.eclipse.rse.tests.framework/plugin.properties
new file mode 100644
index 00000000000..f4e97e6a950
--- /dev/null
+++ b/rse/tests/org.eclipse.rse.tests.framework/plugin.properties
@@ -0,0 +1,14 @@
+################################################################################
+# Copyright (c) 2006 Wind River Systems, Inc. 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: 
+# Martin Oberhuber - initial API and implementation 
+################################################################################
+
+pluginName = RSE Test Framework
+providerName = Eclipse.org
+ 
\ No newline at end of file