diff --git a/org.eclipse.jgit.console/plugin.properties b/org.eclipse.jgit.console/plugin.properties
index a86bcd86b884c681ce979188e842adb1e74f6871..192eaa37043c07dfc6735cec915add7b96a26ab7 100644
--- a/org.eclipse.jgit.console/plugin.properties
+++ b/org.eclipse.jgit.console/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git Console User Interface (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit Console User Interface (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.http.server/plugin.properties b/org.eclipse.jgit.http.server/plugin.properties
index 6ca52145a74ac5d47ac6ec51a57d0871253e3a81..bafc6bb1826dcbfc18d9ebc036681e456a9f6310 100644
--- a/org.eclipse.jgit.http.server/plugin.properties
+++ b/org.eclipse.jgit.http.server/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git HTTP Server (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit HTTP Server (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index 01982da6c5c8110d976169e7358f6ab88d5d0573..1481391f52f8820c5795da79f3f7bfb05bfd0618 100644
--- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Java Git HTTP Tests (Incubation)
+Bundle-Name: %plugin_name
 Bundle-SymbolicName: org.eclipse.jgit.http.test
 Bundle-Version: 0.6.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %provider_name
+Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0",
diff --git a/org.eclipse.jgit.http.test/plugin.properties b/org.eclipse.jgit.http.test/plugin.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d0e3a61cfe879b842d6b024607bbb075c817a6fa
--- /dev/null
+++ b/org.eclipse.jgit.http.test/plugin.properties
@@ -0,0 +1,2 @@
+plugin_name=JGit HTTP Tests (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/plugin.properties
index d137bd49800fcb8b42086d6130a88cfc5937da06..1cc9d1ae0b574a564dea0f1e29fe43c5fa51e2e5 100644
--- a/org.eclipse.jgit.junit/plugin.properties
+++ b/org.eclipse.jgit.junit/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git JUnit Utility Classes (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit JUnit Utility Classes (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
index eba9a59e3087ab915f1566e51af118676d5420ea..c22fc30395d44d8c35cbfe4b9b6c04f4f0b1285a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
@@ -9,7 +9,7 @@
 ###############################################################################
 
 featureName=Eclipse JGit Feature (Incubation)
-providerName=eclipse.org
+providerName=Eclipse.org
 
 updateSiteName=Eclipse Update Site (experimental)
 
diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/plugin.properties
index f8fbd725c1bce724e2f346408c201975f7e389f2..b39fe65f8924808c6c95431f41fffeb32e2fb9e6 100644
--- a/org.eclipse.jgit.pgm/plugin.properties
+++ b/org.eclipse.jgit.pgm/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git Command Line Interface (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit Command Line Interface (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.test/plugin.properties b/org.eclipse.jgit.test/plugin.properties
index 68e67f81073389fa03c04a84e0d2d74470d69e1f..5370431b57073c1998c6bf79026ca5470730ce84 100644
--- a/org.eclipse.jgit.test/plugin.properties
+++ b/org.eclipse.jgit.test/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git Core Tests (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit Core Tests (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit.ui/plugin.properties b/org.eclipse.jgit.ui/plugin.properties
index b9acc51512189eeca8c63ea7986a47addaf455d3..cbca803cc50e30d1019b941b2a025d51ab6dc02c 100644
--- a/org.eclipse.jgit.ui/plugin.properties
+++ b/org.eclipse.jgit.ui/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git AWT User Interface (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit AWT User Interface (Incubation)
+provider_name=Eclipse.org
diff --git a/org.eclipse.jgit/plugin.properties b/org.eclipse.jgit/plugin.properties
index d8e4703b67f83478306bbb5eb9f01d9213e23f70..7f23de92465a72d755a05f8fd1884aa98d88a2d2 100644
--- a/org.eclipse.jgit/plugin.properties
+++ b/org.eclipse.jgit/plugin.properties
@@ -1,2 +1,2 @@
-plugin_name=Java Git Core (Incubation)
-provider_name=eclipse.org
+plugin_name=JGit Core (Incubation)
+provider_name=Eclipse.org