diff --git a/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
index 5dc6218..ffa78f2 100644
--- a/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.edit/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.edit;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.papyrus.sysml14.provider.SysMLEditPlugin$Implementation
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.papyrus.sysml14.activities.provider,
diff --git a/core/org.eclipse.papyrus.sysml14.edit/plugin.properties b/core/org.eclipse.papyrus.sysml14.edit/plugin.properties
index 044652a..d12fe80 100644
--- a/core/org.eclipse.papyrus.sysml14.edit/plugin.properties
+++ b/core/org.eclipse.papyrus.sysml14.edit/plugin.properties
@@ -5,8 +5,8 @@
 #  which accompanies this distribution, and is available at
 #  http://www.eclipse.org/legal/epl-v10.html
 
-pluginName = SysML Edit Support
-providerName = Eclipse Modeling Project
+Bundle-Name = Papyrus SysML 1.4 Edit Support
+Bundle-Vendor = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
index 7cc82e3..8cf856c 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Fragment-Host: org.eclipse.papyrus.sysml14.service.types;bundle-version="0.8.0"
 Export-Package: org.eclipse.papyrus.sysml14.service.types.tests
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.service.types.tests
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/plugin.properties b/core/org.eclipse.papyrus.sysml14.service.types.tests/plugin.properties
index 270cb04..cececed 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/plugin.properties
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/plugin.properties
@@ -10,5 +10,5 @@
 #     CEA LIST - Initial API and Implementation.
 #
 ##################################################################################
-pluginName=Papyrus SysML 1.4 Service Types Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Service Types Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
index 192f19a..d71055d 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.service.types;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.service.types.Activator
@@ -15,8 +15,8 @@
  org.eclipse.papyrus.sysml14;bundle-version="0.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Bundle-Description: %pluginDescription
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Description: %Bundle-Description
 Bundle-Localization: plugin
 Export-Package: org.eclipse.papyrus.sysml14.service.types,
  org.eclipse.papyrus.sysml14.service.types.advice,
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/plugin.properties b/core/org.eclipse.papyrus.sysml14.service.types/plugin.properties
index fafe2ed..b5f208a 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/plugin.properties
+++ b/core/org.eclipse.papyrus.sysml14.service.types/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.service.types
-pluginDescription=This plug-in contains the SyML element types.
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Service Type
+Bundle-Description=This plug-in contains the SyML 1.4 element types.
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
index 6f567e5..703a257 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Manifest-Version: 1.0
 Fragment-Host: org.eclipse.papyrus.sysml14;bundle-version="0.8.1"
 Export-Package: org.eclipse.papyrus.sysml14.tests
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
-Bundle-Description: %pluginDescription
+Bundle-Name: %Bundle-Name
+Bundle-Description: %Bundle-Description
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.tests
diff --git a/core/org.eclipse.papyrus.sysml14.tests/plugin.properties b/core/org.eclipse.papyrus.sysml14.tests/plugin.properties
index 8efa808..dea1b87 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/plugin.properties
+++ b/core/org.eclipse.papyrus.sysml14.tests/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.tests
-pluginDescription=This plug-in contains the tests for SyML 1.4 profile
-providerName=Eclipse Modeling Project
\ No newline at end of file
+Bundle-Name=Papyrus SysML 1.4 Profile Tests
+Bundle-Description=This plug-in contains the tests for SyML 1.4 profile
+Bundle-Vendor=Eclipse Modeling Project
\ No newline at end of file
diff --git a/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
index b322d4d..b51763a 100644
--- a/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
@@ -42,5 +42,5 @@
  org.eclipse.papyrus.sysml14.util
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-Description: %pluginDescription
-Bundle-Vendor: %providerName
+Bundle-Description: %Bundle-Description
+Bundle-Vendor: %Bundle-Vendor
diff --git a/core/org.eclipse.papyrus.sysml14/plugin.properties b/core/org.eclipse.papyrus.sysml14/plugin.properties
index 3af4281..8ae78ca 100644
--- a/core/org.eclipse.papyrus.sysml14/plugin.properties
+++ b/core/org.eclipse.papyrus.sysml14/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14
-pluginDescription=This plug-in contains the SyML profile.
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Profile
+Bundle-Description=This plug-in contains the SyML 1.4 profile.
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
index 7a8fdef..53f4df6 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="0.8.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/plugin.properties
index 4d34f75..9e40db8 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition.tests/plugin.properties
@@ -10,5 +10,5 @@
 #     CEA LIST - Initial API and Implementation.
 #
 ##################################################################################
-pluginName=Papyrus SysML 1.4 Block Definition Diagram Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Block Definition Diagram Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
index 569b6d1..2a2938f 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.blockdefinition;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.blockdefinition.Activator
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties
index c01ed2e..868bf31 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.diagram.blockdefinition
-pluginDescription=This plug-in contains the block definition diagram
-providerName=Eclipse Modeling Project
+Bundle-Name= Papyrus SysML 1.4 Block Definition Diagram
+Bundle-Description=This plug-in contains the block definition diagram
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
index 612ab07..b84c2fd 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.common;bundle-version="0.8.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/plugin.properties
index 4b485eb..6debf29 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/plugin.properties
@@ -10,5 +10,5 @@
 #     CEA LIST - Initial API and Implementation.
 #
 ##################################################################################
-pluginName=Papyrus SysML 1.4 Common Diagram Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Common Diagram Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
index 1f97682..447c1c1 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.common;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
@@ -53,5 +53,5 @@
  org.eclipse.papyrus.sysml14.diagram.common.util
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-Description: %pluginDescription
-Bundle-Vendor: %providerName
+Bundle-Description: %Bundle-Description
+Bundle-Vendor: %Bundle-Vendor
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties
index 34bc8ef..15a8cc3 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.diagram.common
-pluginDescription=This plug-in contains the common part of all SysML 1.4 diagram
-providerName=Eclipse Modeling Project
+Bundle-Name= Papyrus SysML 1.4 Diagram Common
+Bundle-Description=This plug-in contains the common part of all SysML 1.4 diagram
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
index dac0682..95309f2 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="0.8.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/plugin.properties
index 14ec2ab..c57dd2d 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock.tests/plugin.properties
@@ -10,5 +10,5 @@
 #     CEA LIST - Initial API and Implementation.
 #
 ##################################################################################
-pluginName=Papyrus SysML 1.4 Internal Block Diagram Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Internal Block Diagram Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
index 6a04c58..5eafe42 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.internalblock;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.internalblock.Activator
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.uml2.uml,
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties
index 65e7367..0a3f71a 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.diagram.internalblock
-pluginDescription=This plug-in contains the internal block diagram of SysML 1.4
-providerName=Eclipse Modeling Project
+Bundle-Name= Papyrus SysML 1.4 Internal Block Diagram
+Bundle-Description=This plug-in contains the internal block diagram of SysML 1.4
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
index 043f0e5..2d97056 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.11.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="0.8.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/plugin.properties
index 6234a37..82805cc 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric.tests/plugin.properties
@@ -10,5 +10,5 @@
 #   Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
 #
 ##################################################################################
-pluginName=Papyrus SysML 1.4 Parametric Diagram Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 Parametric Diagram Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
index e210272..3763a9c 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.parametric;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.sysml14.diagram.parametric.Activator
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.uml2.uml,
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties
index bbd510d..f3227c8 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.diagram.parametric
-pluginDescription=This plug-in contains the parametric diagram of SysML 1.4
-providerName=Eclipse Modeling Project
+Bundle-Name= Papyrus SysML 1.4 Parametric Diagram
+Bundle-Description=This plug-in contains the parametric diagram of SysML 1.4
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
index 10a54fe..e36691e 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.diagram.requirement;singleton:=true
 Bundle-Version: 0.8.1.qualifier
@@ -13,4 +13,4 @@
  org.eclipse.papyrus.sysml14.diagram.common;bundle-version="0.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties
index 2a17888..34931e9 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.diagram.requirement
-pluginDescription=This plug-in contains the requirement diagram of SysML 1.4
-providerName=Eclipse Modeling Project
+Bundle-Name= Papyrus SysML 1.4 Requirement Diagram
+Bundle-Description=This plug-in contains the requirement diagram of SysML 1.4
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
index ffb3318..158410f 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
@@ -31,9 +31,9 @@
  org.eclipse.papyrus.sysml14.nattable.common;bundle-version="0.8.0",
  org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="0.8.0",
  org.eclipse.papyrus.sysml14.nattable.ui;bundle-version="0.8.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Fragment-Host: org.eclipse.papyrus.sysml14.ui;bundle-version="0.8.0"
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/plugin.properties b/gui/org.eclipse.papyrus.sysml14.ui.tests/plugin.properties
index 9fc137e..ed2c8d3 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/plugin.properties
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/plugin.properties
@@ -1,5 +1,5 @@
 #################################################################################
-# Copyright (c) 2011 CEA LIST.
+# Copyright (c) 2015 CEA LIST.
 # 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
@@ -10,5 +10,5 @@
 #     CEA LIST - Initial API and Implementation.
 #
 ##################################################################################
-pluginName=Papyrus SysML Model Explorer Tests
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 UI Tests
+Bundle-Vendor=Eclipse Modeling Project
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
index 4d9ab52..caf93d5 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.ui;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-ClassPath: .
@@ -39,5 +39,5 @@
  org.eclipse.papyrus.sysml14.ui.template
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-Description: %pluginDescription
-Bundle-Vendor: %providerName
+Bundle-Description: %Bundle-Description
+Bundle-Vendor: %Bundle-Vendor
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/plugin.properties b/gui/org.eclipse.papyrus.sysml14.ui/plugin.properties
index 5270132..a8c277e 100755
--- a/gui/org.eclipse.papyrus.sysml14.ui/plugin.properties
+++ b/gui/org.eclipse.papyrus.sysml14.ui/plugin.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=org.eclipse.papyrus.sysml14.ui
-pluginDescription=This plug-in contains all graphical interface for the SyML 1.4 tooling.
-providerName=Eclipse Modeling Project
+Bundle-Name=Papyrus SysML 1.4 UI
+Bundle-Description=This plug-in contains all graphical interface for the SyML 1.4 tooling.
+Bundle-Vendor=Eclipse Modeling Project
 
 
diff --git a/releng/org.eclipse.papyrus.sysml14.feature/feature.properties b/releng/org.eclipse.papyrus.sysml14.feature/feature.properties
index 4b587ef..2d11e1b 100755
--- a/releng/org.eclipse.papyrus.sysml14.feature/feature.properties
+++ b/releng/org.eclipse.papyrus.sysml14.feature/feature.properties
@@ -1,7 +1,7 @@
 # NLS_MESSAGEFORMAT_VAR
 
 # "featureName" property - name of the feature
-featureName=Papyrus Sysml 1.4 Feature (Incubation)
+featureName=Papyrus SysML 1.4 Feature (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Modeling Project 
diff --git a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
index 14fa5bb..f18c9d2 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
@@ -6,9 +6,9 @@
    <aboutInfo>
       <image path="/org.eclipse.papyrus.sysml14.rcp/icons/papyrus_lg.png"/>
       <text>
-         Papyrus Sysml 1.4 (Beta - Incubation)
+         Papyrus SysML 1.4 (Beta - Incubation)
 
-(c) Copyright Eclipse contributors and others 2000, 2015.  All rights reserved.
+(c) Copyright Eclipse contributors and others 2000, 2016.  All rights reserved.
 Visit http://www.eclipse.org/platform
 
 This product includes software developed by the
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.properties b/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.properties
index 3deb827..10d18d8 100755
--- a/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.properties
+++ b/releng/org.eclipse.papyrus.sysml14.rcp.feature/feature.properties
@@ -1,7 +1,7 @@
 # NLS_MESSAGEFORMAT_VAR
 
 # "featureName" property - name of the feature
-featureName=Papyrus Sysml 1.4 RCP Feature (Incubation)
+featureName=Papyrus SysML 1.4 RCP Feature (Incubation)
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse Modeling Project 
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF b/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
index 5889cf5..10a4d56 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.papyrus.sysml14.rcp/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.rcp;singleton:=true
 Bundle-Version: 0.8.1.qualifier
 Bundle-Vendor: %pluginProvider
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp/plugin.properties b/releng/org.eclipse.papyrus.sysml14.rcp/plugin.properties
index 07c3fa7..4e473df 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp/plugin.properties
+++ b/releng/org.eclipse.papyrus.sysml14.rcp/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     CEA LIST - initial API and implementation
 ################################################################################
-pluginName=Papyrus Sysml 1.4 RCP
+Bundle-Name=Papyrus Sysml 1.4 RCP
 pluginProvider=Eclipse Modeling Project
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/plugin.properties b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/plugin.properties
index 2c88811..072d6f6 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/plugin.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/plugin.properties
@@ -1,4 +1,13 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation.tests
+#################################################################################
+# Copyright (c) 2016 CEA LIST.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus Table Allocations Tests
-Bundle-Description = This plugin provides Tests for the plugin org.eclipse.papyrus.uml.nattable.allocation.
\ No newline at end of file
+Bundle-Name = Papyrus SysML 1.4 Allocation Table Tests
+Bundle-Description = This plugin provides tests for the plugin org.eclipse.papyrus.sysml14.nattable.allocation
\ No newline at end of file
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation/OSGI-INF/l10n/bundle.properties b/table/org.eclipse.papyrus.sysml14.nattable.allocation/OSGI-INF/l10n/bundle.properties
index 5c71bc7..2d57a66 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation/OSGI-INF/l10n/bundle.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,12 @@
-#Properties file for org.eclipse.papyrus.sysml.nattable.allocation
+#################################################################################
+# Copyright (c) 2016 CEA LIST.
+# 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = SysML Allocation Table
\ No newline at end of file
+Bundle-Name = Papyrus SysML 1.4 Allocation Table
\ No newline at end of file
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
index 6f1e60d..a95c129 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.common/META-INF/MANIFEST.MF
@@ -31,4 +31,4 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.nattable.common;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.common/OSGI-INF/l10n/bundle.properties b/table/org.eclipse.papyrus.sysml14.nattable.common/OSGI-INF/l10n/bundle.properties
index 5f30202..4cb7371 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.common/OSGI-INF/l10n/bundle.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.common/OSGI-INF/l10n/bundle.properties
@@ -6,7 +6,6 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 ##################################################################################
-
-pluginDescription=This plugin provides common classes for the sysml nattable.
+Bundle-Description=This plugin provides common classes for the SysML 1.4 tables.
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = SysML Nattable
\ No newline at end of file
+Bundle-Name = Papyrus SysML 1.4 Common Table
\ No newline at end of file
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
index 9826441..ee3302e 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@
  org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0"
-Bundle-Vendor: %providerName
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.8.1.qualifier
-Bundle-Name: %pluginName
+Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.nattable.requirement.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
 Fragment-Host: org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="0.8.0"
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/OSGI-INF/l10n/bundle.properties b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/OSGI-INF/l10n/bundle.properties
index 2ff2807..6643f1f 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/OSGI-INF/l10n/bundle.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014 CEA LIST.
+# Copyright (c) 2015 CEA LIST.
 # 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:
 #     CEA LIST - initial API and implementation
 ###############################################################################
-pluginName=SysML NatTable Requirements Tests
-providerName=Eclipse Modeling Project
-pluginDescription=This plugin tests the plugin org.eclipse.papyrus.sysml.nattable.requirement
\ No newline at end of file
+Bundle-Name = Papyrus SysML 1.4 Requirement Table Tests
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Description = This plugin tests the plugin org.eclipse.papyrus.sysml14.nattable.requirement
\ No newline at end of file
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
index 090cef2..8874b50 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.papyrus.sysml14.nattable.requirement,
  org.eclipse.papyrus.sysml14.nattable.requirement.tester
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/OSGI-INF/l10n/bundle.properties b/table/org.eclipse.papyrus.sysml14.nattable.requirement/OSGI-INF/l10n/bundle.properties
index 3088349..2ce0a01 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/OSGI-INF/l10n/bundle.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/OSGI-INF/l10n/bundle.properties
@@ -7,5 +7,5 @@
 #
 ##################################################################################
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Nattable Requirement Configuration
-pluginDescription=This plugin provides the configuration to use for Requirement Table.
\ No newline at end of file
+Bundle-Name = Papyrus SysML 1.4 Requirement Table
+Bundle-Description=This plugin provides the configuration to use for Requirement Table.
\ No newline at end of file
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
index 0c41c52..dea292a 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
@@ -31,4 +31,4 @@
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml14.nattable.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-Description: %pluginDescription
+Bundle-Description: %Bundle-Description
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/OSGI-INF/l10n/bundle.properties b/table/org.eclipse.papyrus.sysml14.nattable.ui/OSGI-INF/l10n/bundle.properties
index b936d68..72a7cb1 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/OSGI-INF/l10n/bundle.properties
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/OSGI-INF/l10n/bundle.properties
@@ -7,5 +7,5 @@
 #
 ##################################################################################
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Menu for the creation of Sysml elements in the tabular editor
-pluginDescription=This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements
+Bundle-Name = Papyrus SysML 1.4 Table UI
+Bundle-Description=This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements