Bug 495360: Remove "incubation" from Bundle-Name

Also, make the naming of plug-ins and features consistent and set all
Bundle-Vendor to "Eclipse.org - SWTBot"

Change-Id: Ia929c013003a1d8a335f5d13d26b6f5589d87ac4
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
diff --git a/examples/gef/org.eclipse.gef.examples.logic.test/META-INF/MANIFEST.MF b/examples/gef/org.eclipse.gef.examples.logic.test/META-INF/MANIFEST.MF
index b432706..c51cc71 100644
--- a/examples/gef/org.eclipse.gef.examples.logic.test/META-INF/MANIFEST.MF
+++ b/examples/gef/org.eclipse.gef.examples.logic.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: GEF logic SWTBot Test
+Bundle-Name: SWTBot Graphical Editing Framework Logic Editor Example Tests Plug-in
 Bundle-SymbolicName: org.eclipse.gef.examples.logic.test
 Bundle-Version: 2.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -18,3 +18,4 @@
  org.eclipse.core.runtime,
  org.apache.log4j,
  org.eclipse.core.resources
+Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/examples/gef/org.eclipse.gef.examples.logic/plugin.properties b/examples/gef/org.eclipse.gef.examples.logic/plugin.properties
index df7201c..aa166d8 100644
--- a/examples/gef/org.eclipse.gef.examples.logic/plugin.properties
+++ b/examples/gef/org.eclipse.gef.examples.logic/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2000, 2007 IBM Corporation and others.

+# Copyright (c) 2000, 2016 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

@@ -8,8 +8,8 @@
 # Contributors:

 #     IBM Corporation - initial API and implementation

 ###############################################################################

-Plugin.name=Graphical Editing Framework Logic Editor Example

-Plugin.providerName = Eclipse.org

+Plugin.name=SWTBot Graphical Editing Framework Logic Editor Example Plug-in

+Plugin.providerName = Eclipse.org - SWTBot

 

 Logic_example_graphical_editor_name = Logic Graphical Editor

 GEF_example_wizard_category_name = GEF (Graphical Editing Framework)

diff --git a/examples/rcp/org.rcpmail.test/META-INF/MANIFEST.MF b/examples/rcp/org.rcpmail.test/META-INF/MANIFEST.MF
index 3d2bd5d..0129cad 100644
--- a/examples/rcp/org.rcpmail.test/META-INF/MANIFEST.MF
+++ b/examples/rcp/org.rcpmail.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in (incubation)
+Bundle-Name: SWTBot RCPMail Tests Plug-in
 Bundle-SymbolicName: org.rcpmail.test
 Bundle-Version: 1.0.0
 Require-Bundle: org.eclipse.ui,
diff --git a/examples/rcp/org.rcpmail/META-INF/MANIFEST.MF b/examples/rcp/org.rcpmail/META-INF/MANIFEST.MF
index 2d4456a..945c781 100644
--- a/examples/rcp/org.rcpmail/META-INF/MANIFEST.MF
+++ b/examples/rcp/org.rcpmail/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Rcpmail Plug-in (incubation)
+Bundle-Name: SWTBot RCPMail Plug-in
 Bundle-SymbolicName: org.rcpmail; singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.rcpmail.Activator
diff --git a/org.eclipse.swt.examples/META-INF/MANIFEST.MF b/org.eclipse.swt.examples/META-INF/MANIFEST.MF
index 67823ed..2d62c9f 100644
--- a/org.eclipse.swt.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.swt.examples/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Eclipse SWT Example plugin (based on Eclipse's SWT Examples) (incubation)
+Bundle-Name: SWTBot SWT Example Plug-in
 Bundle-SymbolicName: org.eclipse.swt.examples;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.swtbot.ant.junit/META-INF/MANIFEST.MF b/org.eclipse.swtbot.ant.junit/META-INF/MANIFEST.MF
index 2eb49c9..8e21923 100755
--- a/org.eclipse.swtbot.ant.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.ant.junit/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Headless Ant support for JUnit
+Bundle-Name: SWTBot Headless Ant support for JUnit Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.ant.junit
 Bundle-Version: 2.5.0.qualifier
 Fragment-Host: org.apache.ant
diff --git a/org.eclipse.swtbot.e4.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.e4.finder.test/META-INF/MANIFEST.MF
index 20a37d4..2981c5f 100644
--- a/org.eclipse.swtbot.e4.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.e4.finder.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Test
+Bundle-Name: SWTBot Eclipse E4 Control Finder Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.e4.finder.test;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.e4.finder.test.Activator
@@ -25,3 +25,4 @@
 Import-Package: javax.annotation;version="1.0.0",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
+Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.eclipse.dsl/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.dsl/META-INF/MANIFEST.MF
index d27b7ac..87a4743 100644
--- a/org.eclipse.swtbot.eclipse.dsl/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.dsl/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Dsl for Eclipse IDE (incubation)
+Bundle-Name: SWTBot DSL for Eclipse IDE Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.dsl
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.eclipse.dsl.Activator
diff --git a/org.eclipse.swtbot.eclipse.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.finder.test/META-INF/MANIFEST.MF
index 1f164cf..fa56691 100644
--- a/org.eclipse.swtbot.eclipse.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.finder.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Eclipse Control Finder Plug-in Test (incubation)
+Bundle-Name: SWTBot Eclipse Control Finder Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.finder.test;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.eclipse.jface.text,
diff --git a/org.eclipse.swtbot.eclipse.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.finder/META-INF/MANIFEST.MF
index 7e7dbe5..e1042c5 100644
--- a/org.eclipse.swtbot.eclipse.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.finder/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Eclipse Control Finder Plug-in (incubation)
+Bundle-Name: SWTBot Eclipse Control Finder Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.finder;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.swtbot.eclipse.gef.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.gef.finder/META-INF/MANIFEST.MF
index 98a8d23..03cf95b 100644
--- a/org.eclipse.swtbot.eclipse.gef.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.gef.finder/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Gef Plug-in (incubation)
+Bundle-Name: SWTBot Graphical Editing Framework Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.gef.finder;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.swtbot.eclipse.gef/feature.xml b/org.eclipse.swtbot.eclipse.gef/feature.xml
index c171490..840ee71 100644
--- a/org.eclipse.swtbot.eclipse.gef/feature.xml
+++ b/org.eclipse.swtbot.eclipse.gef/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.eclipse.gef"
       label="SWTBot for GEF Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.eclipse.junit.headless/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.junit.headless/META-INF/MANIFEST.MF
index 4ef853b..754172f 100644
--- a/org.eclipse.swtbot.eclipse.junit.headless/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.junit.headless/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Headless JUnit4 Launch Plug-in (incubation)
+Bundle-Name: SWTBot Headless JUnit4 Launch Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.junit.headless;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.eclipse.spy/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.spy/META-INF/MANIFEST.MF
index 54e389a..423c4d0 100644
--- a/org.eclipse.swtbot.eclipse.spy/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.spy/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Eclipse Spy (incubation)
+Bundle-Name: SWTBot Eclipse Spy Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.spy;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.eclipse.spy.Activator
diff --git a/org.eclipse.swtbot.eclipse.test.junit/feature.xml b/org.eclipse.swtbot.eclipse.test.junit/feature.xml
index 6c15ea3..614b1fd 100644
--- a/org.eclipse.swtbot.eclipse.test.junit/feature.xml
+++ b/org.eclipse.swtbot.eclipse.test.junit/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.eclipse.test.junit"
       label="SWTBot JUnit Headless launchers for Eclipse"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
diff --git a/org.eclipse.swtbot.eclipse.ui.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.ui.test/META-INF/MANIFEST.MF
index c2e43ab..f81c672 100644
--- a/org.eclipse.swtbot.eclipse.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.ui.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Eclipse Ui Test Plug-in
+Bundle-Name: SWTBot Eclipse UI Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.ui.test
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF b/org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF
index 2bc59fa..be9b555 100644
--- a/org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.eclipse.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Eclipse UI Plug-in (incubation)
+Bundle-Name: SWTBot Eclipse UI Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.eclipse.ui;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.eclipse.ui.Activator
diff --git a/org.eclipse.swtbot.eclipse/feature.xml b/org.eclipse.swtbot.eclipse/feature.xml
index 62ea562..28780fe 100644
--- a/org.eclipse.swtbot.eclipse/feature.xml
+++ b/org.eclipse.swtbot.eclipse/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.eclipse"
       label="SWTBot for Eclipse Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.forms.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.forms.finder.test/META-INF/MANIFEST.MF
index 25ed767..c6b3243 100644
--- a/org.eclipse.swtbot.forms.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.forms.finder.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Forms Tests
+Bundle-Name: SWTBot Forms Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.forms.finder.test;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -18,4 +18,4 @@
  org.eclipse.ui,
  org.eclipse.swtbot.eclipse.finder,
  org.eclipse.ui.forms.examples;bundle-version="3.1.100"
-Bundle-Vendor: Eclipse SWTBot
+Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.forms.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.forms.finder/META-INF/MANIFEST.MF
index b6ef9a6..e0537b2 100644
--- a/org.eclipse.swtbot.forms.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.forms.finder/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@
  org.eclipse.ui.forms.widgets
 Export-Package: org.eclipse.swtbot.forms.finder,
  org.eclipse.swtbot.forms.finder.widgets
-Bundle-Vendor: Eclipse SWTBot
-Bundle-Name: SWTBot Forms (Incubation)
+Bundle-Vendor: Eclipse.org - SWTBot
+Bundle-Name: SWTBot Forms Plug-in
diff --git a/org.eclipse.swtbot.forms/feature.xml b/org.eclipse.swtbot.forms/feature.xml
index ca6966b..38464a2 100644
--- a/org.eclipse.swtbot.forms/feature.xml
+++ b/org.eclipse.swtbot.forms/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.forms"
       label="SWTBot for Eclipse Forms Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.generator.feature/feature.xml b/org.eclipse.swtbot.generator.feature/feature.xml
index 78dbfd4..cd53ba5 100644
--- a/org.eclipse.swtbot.generator.feature/feature.xml
+++ b/org.eclipse.swtbot.generator.feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.swtbot.generator.feature"
-      label="SWTBot Recorder and Test Generator (Provisional)"
+      label="SWTBot Test Recorder and Code Generator"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -41,7 +41,7 @@
          version="0.0.0"
          unpack="false"/>
 
- <plugin
+   <plugin
          id="org.eclipse.swtbot.generator.ui"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.swtbot.generator.jdt.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator.jdt.test/META-INF/MANIFEST.MF
index c62756f..754a4b8 100644
--- a/org.eclipse.swtbot.generator.jdt.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.generator.jdt.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for SWTBot Test Recorder & Generator JDT
+Bundle-Name: SWTBot Test Recorder & Code Generator JDT Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.generator.jdt.test
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.generator.jdt/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator.jdt/META-INF/MANIFEST.MF
index 0a494f7..897ab7c 100644
--- a/org.eclipse.swtbot.generator.jdt/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.generator.jdt/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Code Generator JDT Plug-in (incubation)
+Bundle-Name: SWTBot Test Recorder & Code Generator JDT Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.generator.jdt;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.generator.rules.workbench/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator.rules.workbench/META-INF/MANIFEST.MF
index 6bd0fca..398594b 100644
--- a/org.eclipse.swtbot.generator.rules.workbench/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.generator.rules.workbench/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Workbench support in SWTBot generator
+Bundle-Name: SWTBot Test Recorder & Code Generator Workbench Support Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.generator.rules.workbench;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.generator.rules.workbench.Activator
-Bundle-Vendor: Eclipse SWTBot
+Bundle-Vendor: Eclipse.org - SWTBot
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.swtbot.generator;bundle-version="2.2.1"
diff --git a/org.eclipse.swtbot.generator.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator.test/META-INF/MANIFEST.MF
index 0d36f75..5e7e003 100644
--- a/org.eclipse.swtbot.generator.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.generator.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for SWTBot Test Recorder & Generator
+Bundle-Name: SWTBot Test Recorder & Code Generator Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.generator.test
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.generator.ui/plugin.properties b/org.eclipse.swtbot.generator.ui/plugin.properties
index fa8c83a..353a071 100644
--- a/org.eclipse.swtbot.generator.ui/plugin.properties
+++ b/org.eclipse.swtbot.generator.ui/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=SWTBot Code Generator UI Plug-in (incubation)
+pluginName=SWTBot Test Recorder & Code Generator UI Plug-in
 bundleVendor=Eclipse.org - SWTBot
 wizardName=Run Test Recorder
 configurationDescription=Create a configuration that will launch a Test Recorder
diff --git a/org.eclipse.swtbot.generator/META-INF/MANIFEST.MF b/org.eclipse.swtbot.generator/META-INF/MANIFEST.MF
index b3a73bc..4ffe26e 100644
--- a/org.eclipse.swtbot.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.generator/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Code Generator Plug-in (incubation)
+Bundle-Name: SWTBot Test Recorder & Code Generator Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.generator;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.go/META-INF/MANIFEST.MF b/org.eclipse.swtbot.go/META-INF/MANIFEST.MF
index 27aec50..fa1c744 100644
--- a/org.eclipse.swtbot.go/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.go/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Go Convenience Plugin (Incubation)
+Bundle-Name: SWTBot Go Convenience Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.go
 Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.eclipse.swtbot.eclipse.core;visibility:=reexport,
diff --git a/org.eclipse.swtbot.ide/feature.xml b/org.eclipse.swtbot.ide/feature.xml
index b2a84f7..effb8d6 100644
--- a/org.eclipse.swtbot.ide/feature.xml
+++ b/org.eclipse.swtbot.ide/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.ide"
       label="SWTBot IDE Features"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF b/org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF
index cb58487..bb7600c 100644
--- a/org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.junit4_x/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot JUnit 4.x Runners (incubation)
+Bundle-Name: SWTBot JUnit 4.x Runners Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.junit4_x
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.nebula.gallery.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.nebula.gallery.finder.test/META-INF/MANIFEST.MF
index adfe4b6..3af9ad1 100644
--- a/org.eclipse.swtbot.nebula.gallery.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.nebula.gallery.finder.test/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for SWTBot for Nebula Gallery
+Bundle-Name: SWTBot Nebula Gallery Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.nebula.gallery.finder.test
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.nebula.gallery.finder.test.Activator
-Bundle-Vendor: Bonitasoft S.A.
+Bundle-Vendor: Eclipse.org - SWTBot
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.swtbot.nebula.gallery.finder;bundle-version="0.1.0",
diff --git a/org.eclipse.swtbot.nebula.gallery.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.nebula.gallery.finder/META-INF/MANIFEST.MF
index c40fa92..b32b1f9 100644
--- a/org.eclipse.swtbot.nebula.gallery.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.nebula.gallery.finder/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nebula Gallery - SWTBot
+Bundle-Name: SWTBot Nebula Gallery Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.nebula.gallery.finder
 Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
@@ -17,4 +17,4 @@
  org.junit;version="4.8.1"
 Export-Package: org.eclipse.swtbot.nebula.gallery.finder,
  org.eclipse.swtbot.nebula.gallery.finder.widgets
-Bundle-Vendor: Bonitasoft S.A.
+Bundle-Vendor: Eclipse-org - SWTBot
diff --git a/org.eclipse.swtbot.nebula.gallery/feature.xml b/org.eclipse.swtbot.nebula.gallery/feature.xml
index 6fa5e76..4bc14e4 100644
--- a/org.eclipse.swtbot.nebula.gallery/feature.xml
+++ b/org.eclipse.swtbot.nebula.gallery/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.nebula.gallery"
       label="SWTBot for Eclipse Nebula Gallery Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.nebula.nattable.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.nebula.nattable.finder.test/META-INF/MANIFEST.MF
index 3e20164..f5f6616 100644
--- a/org.eclipse.swtbot.nebula.nattable.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.nebula.nattable.finder.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Tests for SWTBot for Nebula NatTable
+Bundle-Name: SWTBot Nebula NatTable Test Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.nebula.nattable.finder.test
 Bundle-Version: 2.5.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.swtbot.nebula.nattable.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.nebula.nattable.finder/META-INF/MANIFEST.MF
index 6f85054..3bd061f 100644
--- a/org.eclipse.swtbot.nebula.nattable.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.nebula.nattable.finder/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Nebula NatTable- SWTBOT
+Bundle-Name: SWTBot Nebula NatTable Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.nebula.nattable.finder
 Bundle-Version: 2.5.0.qualifier
 Bundle-Vendor: Eclipse.org - SWTBot
diff --git a/org.eclipse.swtbot.nebula.nattable/feature.xml b/org.eclipse.swtbot.nebula.nattable/feature.xml
index c05ed76..ecb7dc5 100644
--- a/org.eclipse.swtbot.nebula.nattable/feature.xml
+++ b/org.eclipse.swtbot.nebula.nattable/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.nebula.nattable"
       label="SWTBot for Eclipse Nebula NatTable Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.swtbot.swt.demo/META-INF/MANIFEST.MF b/org.eclipse.swtbot.swt.demo/META-INF/MANIFEST.MF
index 668f495..e6f9a11 100644
--- a/org.eclipse.swtbot.swt.demo/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.swt.demo/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot Demo Plug-in (incubation)
+Bundle-Name: SWTBot Demo Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.swt.demo;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-Activator: org.eclipse.swtbot.swt.demo.Activator
diff --git a/org.eclipse.swtbot.swt.finder.test.keyboards/META-INF/MANIFEST.MF b/org.eclipse.swtbot.swt.finder.test.keyboards/META-INF/MANIFEST.MF
index eb88b0c..6f3fbd5 100644
--- a/org.eclipse.swtbot.swt.finder.test.keyboards/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.swt.finder.test.keyboards/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Dummy keyboards layouts for Testing
+Bundle-Name: SWTBot SWT Control Finder Test Keyboard Layouts Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.swt.finder.test.keyboards
 Bundle-Version: 2.5.0.qualifier
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: Eclipse.org - SWTBot
 Fragment-Host: org.eclipse.swtbot.swt.finder;bundle-version="2.1.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.swtbot.swt.finder.test/META-INF/MANIFEST.MF b/org.eclipse.swtbot.swt.finder.test/META-INF/MANIFEST.MF
index 608c1a0..756220c 100644
--- a/org.eclipse.swtbot.swt.finder.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.swt.finder.test/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot SWT Control Finder plugin (incubation)
+Bundle-Name: SWTBot SWT Control Finder Tests Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.swt.finder.test;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Require-Bundle: org.eclipse.swt,
diff --git a/org.eclipse.swtbot.swt.finder/META-INF/MANIFEST.MF b/org.eclipse.swtbot.swt.finder/META-INF/MANIFEST.MF
index e32a125..5c2ae86 100644
--- a/org.eclipse.swtbot.swt.finder/META-INF/MANIFEST.MF
+++ b/org.eclipse.swtbot.swt.finder/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: SWTBot SWT Control Finder plugin (incubation)
+Bundle-Name: SWTBot SWT Control Finder Plug-in
 Bundle-SymbolicName: org.eclipse.swtbot.swt.finder;singleton:=true
 Bundle-Version: 2.5.0.qualifier
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.swtbot.test/feature.xml b/org.eclipse.swtbot.test/feature.xml
index 8810ebe..f090626 100644
--- a/org.eclipse.swtbot.test/feature.xml
+++ b/org.eclipse.swtbot.test/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot.test"
       label="SWTBot Tests Feature"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
 
diff --git a/org.eclipse.swtbot/feature.xml b/org.eclipse.swtbot/feature.xml
index b71d75b..5db27c2 100644
--- a/org.eclipse.swtbot/feature.xml
+++ b/org.eclipse.swtbot/feature.xml
@@ -3,7 +3,7 @@
       id="org.eclipse.swtbot"
       label="SWTBot for SWT Testing"
       version="2.5.0.qualifier"
-      provider-name="Eclipse.org"
+      provider-name="Eclipse.org - SWTBot"
       plugin="org.eclipse.swtbot.eclipse.ui"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/org.eclipse.ui.forms.examples/META-INF/MANIFEST.MF b/org.eclipse.ui.forms.examples/META-INF/MANIFEST.MF
index b01bf31..a5ffb00 100644
--- a/org.eclipse.ui.forms.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.forms.examples/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Version: 3.1.100.qualifier
 Bundle-ClassPath: examples.jar
 Bundle-Activator: org.eclipse.ui.forms.examples.internal.ExamplesPlugin
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: Eclipse.org - SWTBot
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.forms.examples.internal,
  org.eclipse.ui.forms.examples.internal.dialogs,
diff --git a/org.eclipse.ui.forms.examples/plugin.properties b/org.eclipse.ui.forms.examples/plugin.properties
index 94ed361..86876cb 100755
--- a/org.eclipse.ui.forms.examples/plugin.properties
+++ b/org.eclipse.ui.forms.examples/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
+# Copyright (c) 2003, 2016 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
@@ -8,6 +8,6 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-pluginName = Examples of Eclipse Forms
+pluginName = SWTBot UI Forms Example Plug-in
 baseEditor = Simple Form (RCP) Editor
 singleHeaderEditor = Single Header Editor