diff --git a/org.eclipse.jgit.console/plugin.properties b/org.eclipse.jgit.console/plugin.properties
index a86bcd86b..192eaa370 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 6ca52145a..bafc6bb18 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 01982da6c..1481391f5 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 000000000..d0e3a61cf
--- /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 d137bd498..1cc9d1ae0 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 eba9a59e3..c22fc3039 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 f8fbd725c..b39fe65f8 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 68e67f810..5370431b5 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 b9acc5151..cbca803cc 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 d8e4703b6..7f23de924 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