diff --git a/rse/doc/org.eclipse.dstore.doc.isv/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.dstore.doc.isv/META-INF/MANIFEST.MF
index eae190b5b7d..793d4eb70af 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/META-INF/MANIFEST.MF
+++ b/rse/doc/org.eclipse.dstore.doc.isv/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.dstore.doc.isv; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
-Bundle-Vendor: %provider.name
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.dstore.doc.isv; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Eclipse-LazyStart: false
+Bundle-Vendor: %providerName
diff --git a/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties b/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties
index 4182acfa655..e3f45637e1a 100755
--- a/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties
+++ b/rse/doc/org.eclipse.dstore.doc.isv/plugin.properties
@@ -1,22 +1,22 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-plugin.name=RSE DStore ISV Documentation
-provider.name=Eclipse.org
-
-projectGenerators.helloWorld.name = Hello, World
-projectGenerators.helloWorld.description=\
-<p>This wizard creates standard plug-in directory structure and \
-adds the following:</p>\
-<li><b>Action set</b>. %template.helloWorld.desc%</li>\
-<p><b>Extensions Used</b></p>\
-<li>org.eclipse.ui.actionSet</li>
+###############################################################################
+# Copyright (c) 2000, 2006 IBM 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+# NLS_MESSAGEFORMAT_VAR
+pluginName=RSE DStore ISV Documentation
+providerName=Eclipse.org
+
+projectGenerators.helloWorld.name = Hello, World
+projectGenerators.helloWorld.description=\
+<p>This wizard creates standard plug-in directory structure and \
+adds the following:</p>\
+<li><b>Action set</b>. %template.helloWorld.desc%</li>\
+<p><b>Extensions Used</b></p>\
+<li>org.eclipse.ui.actionSet</li>
diff --git a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
index a8eab3c1b64..06aeef52aa1 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
+++ b/rse/doc/org.eclipse.rse.doc.isv/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.rse.doc.isv; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
-Bundle-Vendor: %provider.name
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rse.doc.isv; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Eclipse-LazyStart: false
+Bundle-Vendor: %providerName
diff --git a/rse/doc/org.eclipse.rse.doc.isv/plugin.properties b/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
index 2ed17d9cd42..31afcd44f48 100755
--- a/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
+++ b/rse/doc/org.eclipse.rse.doc.isv/plugin.properties
@@ -1,12 +1,12 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM 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:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-plugin.name=RSE Developer Guide
-provider.name=Eclipse.org
+###############################################################################
+# Copyright (c) 2000, 2006 IBM 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:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+pluginName=RSE Developer Guide
+providerName=Eclipse.org
diff --git a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF b/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
index 5e63ea6b38b..13935759547 100755
--- a/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
+++ b/rse/doc/org.eclipse.rse.doc.user/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.rse.doc.user; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %provider.name
-Bundle-Localization: plugin
-Eclipse-LazyStart: false
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rse.doc.user; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Eclipse-LazyStart: false
diff --git a/rse/doc/org.eclipse.rse.doc.user/plugin.properties b/rse/doc/org.eclipse.rse.doc.user/plugin.properties
index 64d6af087e4..b918b6280f1 100755
--- a/rse/doc/org.eclipse.rse.doc.user/plugin.properties
+++ b/rse/doc/org.eclipse.rse.doc.user/plugin.properties
@@ -1,18 +1,18 @@
-################################################################################
-# Copyright (c) 2006 IBM 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
-# 
-# Initial Contributors:
-# The following IBM employees contributed to the Remote System Explorer
-# component that contains this file: David McKnight, Kushal Munir, 
-# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
-# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
-# 
-# Contributors:
-# {Name} (company) - description of contribution.
-################################################################################
-
-plugin.name = RSE User Guide
-provider.name = Eclipse.org
+################################################################################
+# Copyright (c) 2006 IBM 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
+# 
+# Initial Contributors:
+# The following IBM employees contributed to the Remote System Explorer
+# component that contains this file: David McKnight, Kushal Munir, 
+# Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
+# Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
+# 
+# Contributors:
+# {Name} (company) - description of contribution.
+################################################################################
+
+pluginName = RSE User Guide
+providerName = Eclipse.org
diff --git a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
index f4a1a19d04c..fbc42d5dc74 100644
--- a/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.sdk/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.sdk
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %provider.name
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.sdk/plugin.properties b/rse/plugins/org.eclipse.rse.sdk/plugin.properties
index d210a2973a3..4f6318cc8ba 100644
--- a/rse/plugins/org.eclipse.rse.sdk/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.sdk/plugin.properties
@@ -9,5 +9,5 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 
-plugin.name = RSE SDK
-provider.name = Eclipse.org
\ No newline at end of file
+pluginName = RSE SDK
+providerName = Eclipse.org
\ No newline at end of file