Fix plug-in names and providers

37 files changed, 49 insertions, 46 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
index 6a5cceea50a..152d896f934 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Fragment-Host: org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0"
 Eclipse-PatchFragment: true

 Bundle-ClassPath: .

 Bundle-Version: 0.9.0.v1

-Bundle-Name: %fragmentName

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/fragment.properties b/plugins/customization/org.eclipse.papyrus.customization.palette/fragment.properties
index 2e801ce5c81..570a1af8384 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/fragment.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/fragment.properties
@@ -10,4 +10,3 @@
 ##################################################################################

 pluginName=Papyrus Palette Customization Fragment (Incubation)

 providerName=Eclipse Modeling Project

-

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/plugin.properties
index 8034ad05c7e..62a3fdb348f 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/plugin.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.newchild/plugin.properties
@@ -4,5 +4,5 @@
 #

 # $Id$

 

-pluginName = NewChild Model

-providerName = www.example.org

+pluginName = NewChild Model (Incubation)

+providerName = Eclipse Modeling Project

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
index 566a644a919..9d7999611cd 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.gmfdiag.css.xtext;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.xtext,
  org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
  org.eclipse.gmf.runtime.draw2d.ui;bundle-version="1.5.0",
  org.eclipse.draw2d;bundle-version="3.8.0",
@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="0.9.0",
  org.eclipse.papyrus.infra.emf;bundle-version="0.9.0",
  org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="0.9.0",
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.gmfdiag.css
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
index eba11a6cbef..d8bdc830c95 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

-Bundle-Name: org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui

-Bundle-Vendor: My Company

-Bundle-Version: 1.0.0

+Bundle-Name: CSS Editor UI (Incubation)

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-Version: 0.9.0

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext.ui; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css.xtext,

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
index 750340820db..efbc7ef2e65 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.xtext/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

-Bundle-Name: org.eclipse.papyrus.infra.gmfdiag.css.xtext

-Bundle-Vendor: My Company

-Bundle-Version: 1.0.0

+Bundle-Name: CSS Editor (Incubation)

+Bundle-Vendor: Eclipse Modeling Project

+Bundle-Version: 0.9.0

 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.css.xtext; singleton:=true

 Bundle-ActivationPolicy: lazy

 Require-Bundle: org.eclipse.xtext;bundle-version="2.1.0";visibility:=reexport,

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
index 22d0644a227..b0e534a2f63 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.infra.gmfdiag.properties

-Bundle-Vendor = www.eclipse.org

-Bundle-Name = Notation
\ No newline at end of file
+Bundle-Vendor = Eclipse Modeling Project

+Bundle-Name = Appearance properties (Incubation)
\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
index 357d9066507..02bdb57fb28 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.infra.gmfdiag.widgets

-Bundle-Vendor = www.eclipse.org

-Bundle-Name = GMF Widgets
\ No newline at end of file
+Bundle-Vendor = Eclipse Modeling Project

+Bundle-Name = GMF Widgets (Incubation)
\ No newline at end of file
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
index f284a6f426d..369452dea69 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/plugin.properties
@@ -10,4 +10,4 @@
 #  	  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service

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

 pluginName=Papyrus Decoration Integration (Incubation)

-pluginProvider=Eclipse Modeling Project

+providerName=Eclipse Modeling Project

diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
index 8ec77d6b94f..216096c3479 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/plugin.properties
@@ -10,4 +10,4 @@
 #  Amine EL KOUHEN (CEA LIST) Amine.elkouhen@cea.fr - Added the Menu Extension File Monitoring and Decoration Service

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

 pluginName=Papyrus Validation Listening Service (Incubation)

-pluginProvider=Eclipse Modeling Project

+providerName=Eclipse Modeling Project

diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties
index 3e01e911349..0b6f48cf843 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.infra.table.properties

-providerName = Eclipse Modeling Project (Incubation)

-pluginName = Papyrus Table Property View
\ No newline at end of file
+providerName = Eclipse Modeling Project

+pluginName = Papyrus Table Property View (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
index 65dceca3b8b..81f3ea7df35 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/META-INF/MANIFEST.MF
@@ -20,3 +20,4 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Activator: org.eclipse.papyrus.uml.alf.ui.internal.AlfActivator

 Export-Package: org.eclipse.papyrus.uml.alf.ui.contentassist,

  org.eclipse.papyrus.uml.alf.ui.contentassist.antlr

+Bundle-Localization: plugin

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/plugin.properties b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/plugin.properties
index d4aa380493f..80368b16b44 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/plugin.properties
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf.ui/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.alf.ui

-providerName = Eclipse.org

-pluginName = org.eclipse.papyrus.uml.alf.ui
\ No newline at end of file
+providerName = Eclipse Modeling Project

+pluginName = UML ALF UI (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
index a626ea9d85a..8cca603da66 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/META-INF/MANIFEST.MF
@@ -37,4 +37,4 @@ Export-Package: org.eclipse.papyrus.uml.alf,
  org.eclipse.papyrus.uml.alf.validation,

  org.eclipse.papyrus.uml.alf.validation.typing,

  org.eclipse.papyrus.uml.alf.generator

-

+Bundle-Localization: plugin

diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/plugin.properties b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/plugin.properties
index 7bbf655d301..d3f4066b277 100644
--- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/plugin.properties
+++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.alf

-providerName = Eclipse.org

-pluginName = org.eclipse.papyrus.uml.alf
\ No newline at end of file
+providerName = Eclipse Modeling Project

+pluginName = UML ALF (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
index f83959dd6f9..1fb64c8ba42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     Patrick.Tessier@cea.fr - Initial API and implementation

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

-pluginName=org.eclipse.papyrus.uml.diagram.modelexplorer(Incubation)

+pluginName=UML Diagram ModelExplorer (Incubation)

 providerName=Eclipse Modeling Project

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 87df4e5d8f0..59806fa71ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.core.expressions,
  org.eclipse.papyrus.uml.appearance;bundle-version="0.9.0"

 Bundle-Vendor: %providerName

 Eclipse-LazyStart: true

-Bundle-Version: 0.7.1.qualifier

+Bundle-Version: 0.9.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true

diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/plugin.properties b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/plugin.properties
index 3f6cedf3e6d..c02086a0690 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/plugin.properties
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=org.eclipse.papyrus.uml.modelexplorer.widgets (Incubation)

+pluginName=UML ModelExplorer Widgets (Incubation)

 providerName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF
index ef54e030d38..9ce3fb5e19b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.tabbedproperties.comments/META-INF/MANIFEST.MF
@@ -23,4 +23,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.properties.tabbedproperties.comments.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties.tabbedproperties.comments;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Bundle-Localization: plugin

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index 19ac22af265..844f3a74675 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -45,11 +45,11 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints,
  org.eclipse.papyrus.uml.properties.providers,

  org.eclipse.papyrus.uml.properties.util,

  org.eclipse.papyrus.uml.properties.widgets

-Bundle-Vendor: %Bundle-Vendor

+Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 0.9.0.qualifier

 Bundle-Localization: plugin

-Bundle-Name: %Bundle-Name

+Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.properties.Activator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties;singleton:=true

diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties b/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties
index b0570431d94..fe62ba45c8b 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties
+++ b/plugins/uml/table/org.eclipse.papyrus.uml.table.default/plugin.properties
@@ -9,4 +9,4 @@
 #     Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

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

 pluginName=Papyrus Default Table Editor (Incubation)

-providerName=Eclipse.org

+providerName=Eclipse Modeling Project

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
index 7c0c4ec2a9a..549f3aa8925 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - initial API and implementation

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

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = Papyrus CollaborationUse xtext ui direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
index 83d0ee0e357..0e60f765652 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.collaborationuse.xtext/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - initial API and implementation

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

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = Papyrus CollaborationUse xtext direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
index 5a470867ab6..9b5ea091e5a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator

 Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Bundle-Localization: plugin

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
index ba0d99aa0d7..e5d5f56e5f2 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/plugin.properties
@@ -9,4 +9,4 @@
 #     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

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

 pluginName=Papyrus ConnectionPointReference xtext ui direct editor (Incubation)

-providerName=Eclipse.org
\ No newline at end of file
+providerName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
index ddd24382cf6..9b0352d5b02 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/META-INF/MANIFEST.MF
@@ -34,3 +34,4 @@ Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-Localization: plugin

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
index b78d92381c2..e8e3113e763 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext/plugin.properties
@@ -9,4 +9,4 @@
 #     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

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

 pluginName=Papyrus ConnectionPointReference xtext direct editor (Incubation)

-providerName=Eclipse.org

+providerName=Eclipse Modeling Project

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
index 66b2bfa6af4..a271aa68548 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
index d7b4c66c6d0..3221413b801 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

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

-pluginName=org.eclipse.papyrus.constraintwithessentialocl.editor.xtext

-providerName=Eclipse.org
\ No newline at end of file
+pluginName=OCL Constraint direct editor (Incubation)

+providerName=Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.properties
index 2ae668e403f..be91c4c72cd 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext.ui/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.textedit.parameter.xtext.ui

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = Papyrus Parameter xtext ui direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/plugin.properties
index afedc32fcac..90909a9df8a 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.parameter.xtext/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.textedit.parameter.xtext

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = Papyrus Parameter xtext direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
index 2849ed9c4c0..0dfd5080c18 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF
@@ -37,3 +37,4 @@ Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui,
  org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.outline,

  org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.quickfix

 Bundle-Activator: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui.internal.AppliedStereotypePropertyActivator

+Bundle-Localization: plugin

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.properties
index df5ea822f7e..e2b33b40126 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = UI Papyrus applied stereotype property xtext direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
index e5e5a1bb112..9fa8869f1a2 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF
@@ -40,4 +40,4 @@ Export-Package: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext,
  org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.serializer,

  org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr,

  org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.parser.antlr.internal

-

+Bundle-Localization: plugin

diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/plugin.properties b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/plugin.properties
index 00ca75f8c43..1a79b9d1577 100644
--- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/plugin.properties
+++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext

-providerName = Eclipse.org

+providerName = Eclipse Modeling Project

 pluginName = Papyrus applied stereotype property xtext direct editor (Incubation)
\ No newline at end of file
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index b05cee3a861..f02ca662d1b 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: UML Tools
+Bundle-Name: UML Tools (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true
 Bundle-Version: 0.9.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/plugin.properties
index 2ec1e10ced0..b7fbb7b479a 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.widgets/plugin.properties
@@ -1,2 +1,2 @@
-pluginName=org.eclipse.papyrus.views.modelexplorer.widgets (Incubation)

+pluginName=ModelExplorer Widgets (Incubation)

 providerName=Eclipse Modeling Project
\ No newline at end of file