diff --git a/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF b/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF
index e18c234cba4..f9e52bbf41e 100644
--- a/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF
+++ b/wince/org.eclipse.rse.subsystems.wince/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.wince;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.rse.services,
diff --git a/wince/org.eclipse.rse.subsystems.wince/plugin.properties b/wince/org.eclipse.rse.subsystems.wince/plugin.properties
index 22463e674f7..d4bcbd9b7a9 100644
--- a/wince/org.eclipse.rse.subsystems.wince/plugin.properties
+++ b/wince/org.eclipse.rse.subsystems.wince/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
+# Copyright (c) 2008 Radoslav Gerganov 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
@@ -7,13 +7,14 @@
 #
 # Contributors:
 #    Radoslav Gerganov - initial API and implementation
+# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
 ###############################################################################
 
 # NLS_MESSAGEFORMAT_NONE
 # NLS_ENCODING=UTF-8
 
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = RSE WinCE Services
+providerName = Eclipse.org
+pluginName = RSE WinCE Services
 systemType.label.0 = WinCE
 configuration.description.0 = This configuration allows you to work with files on remote WinCE-based device using ActiveSync/RAPI2 connection.
 configuration.name.0 = WinCE Files
diff --git a/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF
index 003ecf5930d..0180b94eb9d 100644
--- a/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF
+++ b/wince/org.eclipse.tm.rapi.examples/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.rapi.examples
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.tm.rapi.examples.Activator
-Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/wince/org.eclipse.tm.rapi.examples/plugin.properties b/wince/org.eclipse.tm.rapi.examples/plugin.properties
index 6012c1b9b25..3fb96135258 100644
--- a/wince/org.eclipse.tm.rapi.examples/plugin.properties
+++ b/wince/org.eclipse.tm.rapi.examples/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
+# Copyright (c) 2008 Radoslav Gerganov 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
@@ -7,6 +7,11 @@
 #
 # Contributors:
 #    Radoslav Gerganov - initial API and implementation
+# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
 ###############################################################################
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Example usage of RAPI2
\ No newline at end of file
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+providerName = Eclipse.org
+pluginName = RAPI2 Java wrapper examples
\ No newline at end of file
diff --git a/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF
index 0bcfcf264a5..af65cde5e73 100644
--- a/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF
+++ b/wince/org.eclipse.tm.rapi.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.rapi.tests
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Require-Bundle: org.junit
diff --git a/wince/org.eclipse.tm.rapi.tests/plugin.properties b/wince/org.eclipse.tm.rapi.tests/plugin.properties
index ba3977c4400..f88ea07fc33 100644
--- a/wince/org.eclipse.tm.rapi.tests/plugin.properties
+++ b/wince/org.eclipse.tm.rapi.tests/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
+# Copyright (c) 2008 Radoslav Gerganov 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
@@ -7,6 +7,11 @@
 #
 # Contributors:
 #    Radoslav Gerganov - initial API and implementation
+# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
 ###############################################################################
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Unit tests for org.eclipse.tm.rapi
\ No newline at end of file
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+providerName = Eclipse.org
+pluginName = RAPI2 Java wrapper unit tests
\ No newline at end of file
diff --git a/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF b/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF
index 0382d6fc69f..254cb745824 100644
--- a/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF
+++ b/wince/org.eclipse.tm.rapi/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.rapi
 Bundle-Version: 1.0.0.qualifier
 Export-Package: org.eclipse.tm.internal.rapi;x-internal:=true,
  org.eclipse.tm.rapi
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: %Bundle-Vendor.0
+Bundle-Vendor: %providerName
 Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
 Bundle-Localization: plugin
diff --git a/wince/org.eclipse.tm.rapi/plugin.properties b/wince/org.eclipse.tm.rapi/plugin.properties
index 751c2a744fa..4a81e4f6aa8 100644
--- a/wince/org.eclipse.tm.rapi/plugin.properties
+++ b/wince/org.eclipse.tm.rapi/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2008 Radoslav Gerganov
+# Copyright (c) 2008 Radoslav Gerganov 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
@@ -7,6 +7,11 @@
 #
 # Contributors:
 #    Radoslav Gerganov - initial API and implementation
+# Martin Oberhuber (Wind River) - Rename pluginName, add PII NLS tags
 ###############################################################################
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Java wrappers for RAPI2
\ No newline at end of file
+
+# NLS_MESSAGEFORMAT_NONE
+# NLS_ENCODING=UTF-8
+
+providerName = Eclipse.org
+pluginName = RAPI2 Java wrappers
\ No newline at end of file