diff --git a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
index 7249d63..4b406aa 100755
--- a/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
+++ b/features/org.eclipse.papyrus.model2doc.integration.feature/feature.xml
@@ -37,7 +37,7 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
-         
+
    <plugin
          id="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer"
          download-size="0"
@@ -65,6 +65,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui"
@@ -110,7 +117,7 @@
          download-size="0"
          install-size="0"
          version="0.0.0"/>
-         
+
    <plugin
          id="org.eclipse.papyrus.model2doc.integration.uml.architecture"
          download-size="0"
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.author.edit/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.author.edit/plugin.properties
index 65dd51b..edbc943 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.author.edit/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.author.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = org.eclipse.papyrus.model2doc.core.author Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - Author Metamodel Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
index 2e9b6b6..4970322 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc Core BuiltIn Types Edit Support(Incubation)
+pluginName = Papyrus-Model2Doc - Core BuiltIn Types Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/plugin.properties
index 20481c1..4de63c7 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.builtintypes/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc Core BuiltIn Types (Incubation)
+pluginName = Papyrus-Model2Doc - Core BuiltIn Types (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit/plugin.properties
index d026e21..5759902 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc Generator Configuration Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - Generator Configuration Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration/plugin.properties
index 45075c0..f3b74b4 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.generatorconfiguration/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc Generator Configuration (Incubation)
+pluginName = Papyrus-Model2Doc - Generator Configuration (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.onefile/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.onefile/plugin.properties
index f351048..6b03235 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.onefile/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.onefile/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc Core OneFile (Incubation)
+pluginName = Papyrus-Model2Doc - Core OneFile (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core.ui/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core.ui/plugin.properties
index c0ec1a0..f1528bf 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core.ui/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core.ui/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc Core UI (Incubation)
+pluginName = Papyrus-Model2Doc - Core UI (Incubation)
 providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/core/org.eclipse.papyrus.model2doc.core/plugin.properties b/plugins/core/org.eclipse.papyrus.model2doc.core/plugin.properties
index 97279db..ce80201 100755
--- a/plugins/core/org.eclipse.papyrus.model2doc.core/plugin.properties
+++ b/plugins/core/org.eclipse.papyrus.model2doc.core/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc Core (Incubation)
+pluginName = Papyrus-Model2Doc - Core (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/dev/org.eclipse.papyrus.model2doc.dev.tools/OSGI-INF/l10n/bundle.properties b/plugins/dev/org.eclipse.papyrus.model2doc.dev.tools/OSGI-INF/l10n/bundle.properties
index 2a244c8..2cd57b4 100755
--- a/plugins/dev/org.eclipse.papyrus.model2doc.dev.tools/OSGI-INF/l10n/bundle.properties
+++ b/plugins/dev/org.eclipse.papyrus.model2doc.dev.tools/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,16 @@
+#
+# Copyright (c) 2019 CEA LIST.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+# 
+# Contributors:
+#  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+#
 #Properties file for org.eclipse.papyrus.model2doc.dev.tools
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus-Model2Doc Dev Tools (Incubation)
\ No newline at end of file
+Bundle-Name = Papyrus-Model2Doc - Dev Tools (Incubation)
\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.model2doc.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.model2doc.doc/plugin.properties
index 1c8453d..0cbff0e 100755
--- a/plugins/doc/org.eclipse.papyrus.model2doc.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.model2doc.doc/plugin.properties
@@ -11,5 +11,5 @@
 # Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 #
-pluginName = Papyrus-Model2Doc Documentation plugin (Incubation)
+pluginName = Papyrus-Model2Doc - Documentation plugin (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.edit/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.edit/plugin.properties
index e8dbdb5..66a180f 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.edit/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.edit/plugin.properties
@@ -11,7 +11,7 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = DocumentView Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.editor/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.editor/plugin.properties
index c34fe52..a80cb2f 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.editor/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model.editor/plugin.properties
@@ -11,7 +11,7 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = DocumentView Editor (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Editor (Incubation)
 providerName = Eclipse Modeling Project
 
 _UI_DocumentViewEditor_menu = &DocumentView Editor
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model/plugin.properties
index 77be221..fdcadf3 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.model/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Model (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Model (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.modelexplorer/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.modelexplorer/plugin.properties
index 12001ac..90241a7 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.modelexplorer/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.modelexplorer/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Model Explorer (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Model Explorer (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation.edit/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation.edit/plugin.properties
index 9ff4216..724f6bc 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation.edit/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation.edit/plugin.properties
@@ -11,7 +11,7 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Representation Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Representation Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation/plugin.properties
index 20da315..485cbd7 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.representation/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Representation (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Representation (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/META-INF/MANIFEST.MF b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/META-INF/MANIFEST.MF
index 1a486fc..2ef1b40 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/META-INF/MANIFEST.MF
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/META-INF/MANIFEST.MF
@@ -5,14 +5,13 @@
 Bundle-Vendor: %providerName
 Bundle-Version: 0.7.0.qualifier
 Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.papyrus.model2doc.documentview.resource.Activator
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[0.0.0,4.0.0)",
  org.eclipse.papyrus.model2doc.documentview.model;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="(2.0.0,3.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.0.0,3.0.0]"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.papyrus.model2doc.documentview.notation
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/plugin.properties
index 6db322f..2bff13b 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.resource/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Resource (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Resource (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.ui/plugin.properties b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.ui/plugin.properties
index 1c2c033..21c50a3 100755
--- a/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.ui/plugin.properties
+++ b/plugins/documentview/org.eclipse.papyrus.model2doc.documentview.ui/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView UI (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView UI (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.edit/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.edit/plugin.properties
index c494a6f..6afcb15 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.edit/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc DocumentStructure Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentStructure Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.editor/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.editor/plugin.properties
index 9c82a83..fc7ad50 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.editor/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure.editor/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc DocumentStructure Editor (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentStructure Editor (Incubation)
 providerName = Eclipse Modeling Project
 _UI_DocumentStructureEditor_menu = &DocumentStructure Editor
 _UI_CreateChild_menu_item = &New Child
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure/plugin.properties
index dc45e1c..edc8986 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructure/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc DocumentStructure (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentStructure (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit/plugin.properties
index 21e6216..7f58fe8 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc EMF DocumentStructureTemplate Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - EMF DocumentStructureTemplate Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.editor/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.editor/plugin.properties
index 90c8cc2..2653603 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.editor/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.editor/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc EMF DocumentStructureTemplate Editor (Incubation)
+pluginName = Papyrus-Model2Doc - EMF DocumentStructureTemplate Editor (Incubation)
 providerName = Eclipse Modeling Project
 _UI_DocumentStructureTemplateEditor_menu = &DocumentStructureTemplate Editor
 _UI_CreateChild_menu_item = &New Child
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/plugin.properties b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/plugin.properties
index 2f42870..2c028a3 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/plugin.properties
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc EMF Document Structure Template (Incubation)
+pluginName = Papyrus-Model2Doc - EMF Document Structure Template (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/emf/org.eclipse.papyrus.model2doc.emf.template2structure/META-INF/MANIFEST.MF b/plugins/emf/org.eclipse.papyrus.model2doc.emf.template2structure/META-INF/MANIFEST.MF
index e49b46c..21c297a 100755
--- a/plugins/emf/org.eclipse.papyrus.model2doc.emf.template2structure/META-INF/MANIFEST.MF
+++ b/plugins/emf/org.eclipse.papyrus.model2doc.emf.template2structure/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc EMF Template2Structure (Incubation)
+Bundle-Name: Papyrus-Model2Doc - EMF Template2Structure (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.emf.template2structure;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.emf.template2structure.Activator
diff --git a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate.edit/plugin.properties b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate.edit/plugin.properties
index b05e01b..1362735 100755
--- a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc GMF DocumentStructureTemplate Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - GMF DocumentStructureTemplate Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate/plugin.properties b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate/plugin.properties
index f8c176d..4a2135b 100755
--- a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate/plugin.properties
+++ b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.documentstructuretemplate/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc GMF DocumentStructureTemplate (Incubation)
+pluginName = Papyrus-Model2Doc - GMF DocumentStructureTemplate (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.template2structure/META-INF/MANIFEST.MF b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.template2structure/META-INF/MANIFEST.MF
index 1aad246..5fb7ac9 100755
--- a/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.template2structure/META-INF/MANIFEST.MF
+++ b/plugins/gmf/org.eclipse.papyrus.model2doc.gmf.template2structure/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc GMF Template2structure (Incubation)
+Bundle-Name: Papyrus-Model2Doc - GMF Template2structure (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.gmf.template2structure;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.gmf.template2structure.Activator
diff --git a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.architecture/plugin.properties b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.architecture/plugin.properties
index 14c12e5..9176f60 100755
--- a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.architecture/plugin.properties
+++ b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.architecture/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc IEEE Requirements ODT Architecture (Incubation)
+pluginName = Papyrus-Model2Doc - IEEE Requirements ODT Architecture (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.ui/plugin.properties b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.ui/plugin.properties
index 2163447..93bb140 100755
--- a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.ui/plugin.properties
+++ b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt.ui/plugin.properties
@@ -11,7 +11,7 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc IEEE Requirements ODT UI (Incubation)
+pluginName = Papyrus-Model2Doc - IEEE Requirements ODT UI (Incubation)
 providerName = Eclipse Modeling Project
 
 model2doc.odt.ui.modelexplorer.menu.label=New Document
diff --git a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt/plugin.properties b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt/plugin.properties
index 8c984ed..f97f93b 100755
--- a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt/plugin.properties
+++ b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements.odt/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc IEEE Requirements ODT (Incubation)
+pluginName = Papyrus-Model2Doc - IEEE Requirements ODT (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements/plugin.properties b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements/plugin.properties
index b04ec62..2de1a01 100755
--- a/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements/plugin.properties
+++ b/plugins/integration/ieee/org.eclipse.papyrus.model2doc.integration.ieee.requirements/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus IEEE Requirements Documentation Model (Incubation)
+pluginName = Papyrus-Model2Doc - IEEE Requirements Documentation Model (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate.edit/plugin.properties b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate.edit/plugin.properties
index 883b3fa..b40b5a7 100755
--- a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc NatTable DocumentStructureTemplate Integration Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - NatTable DocumentStructureTemplate Integration Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate/plugin.properties b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate/plugin.properties
index 8e00410..ce848d8 100755
--- a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate/plugin.properties
+++ b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.documentstructuretemplate/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc NatTable DocumentStructureTemplate Integration (Incubation)
+pluginName = Papyrus-Model2Doc - NatTable DocumentStructureTemplate Integration (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.template2structure/OSGI-INF/l10n/bundle.properties b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.template2structure/OSGI-INF/l10n/bundle.properties
index 860adf2..8a6e5f8 100755
--- a/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.template2structure/OSGI-INF/l10n/bundle.properties
+++ b/plugins/integration/nattable/org.eclipse.papyrus.model2doc.integration.nattable.template2structure/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.model2doc.integration.nattable.template2structure
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus-Model2Doc Nattable Template2structure Integration (Incubation)
\ No newline at end of file
+Bundle-Name = Papyrus-Model2Doc - Nattable Template2structure Integration (Incubation)
\ No newline at end of file
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/plugin.properties
index 12001ac..90241a7 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.modelexplorer/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc DocumentView Model Explorer (Incubation)
+pluginName = Papyrus-Model2Doc - DocumentView Model Explorer (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties/OSGI-INF/l10n/bundle.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties/OSGI-INF/l10n/bundle.properties
index cce7465..9d34f41 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties/OSGI-INF/l10n/bundle.properties
@@ -12,4 +12,4 @@
 
 #Properties file for org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus-Model2Doc EMF DocumentStructureTemplate Properties (Incubation)
\ No newline at end of file
+Bundle-Name = Papyrus-Model2Doc - EMF DocumentStructureTemplate Properties (Incubation)
\ No newline at end of file
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.edit/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.edit/plugin.properties
index ce111bf..d191287 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.edit/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Document Structure Template Representation Edit Support
+pluginName = Papyrus-Model2Doc - Document Structure Template Representation Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation/plugin.properties
index ee3713b..c65a62c 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Document Structure Template Representation
+pluginName = Papyrus-Model2Doc - Document Structure Template Representation (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.classpath b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.classpath
new file mode 100755
index 0000000..eca7bdb
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.project b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.project
new file mode 100755
index 0000000..0f1a847
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.resources.prefs b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 0000000..896a9a5
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
\ No newline at end of file
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.runtime.prefs b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.runtime.prefs
new file mode 100755
index 0000000..5a0ad22
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.core.prefs b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.core.prefs
new file mode 100755
index 0000000..74c6d08
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,297 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=260
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=260
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.ui.prefs b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.ui.prefs
new file mode 100755
index 0000000..1a3bd02
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=false
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=false
+cleanup.use_this_for_non_static_field_access=false
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=false
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_Papyrus
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_Papyrus
+formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=99
+org.eclipse.jdt.ui.staticondemandthreshold=99
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier: EPL-2.0\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=false
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_modifiers=false
+sp_cleanup.remove_redundant_type_arguments=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=true
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.pde.api.tools.prefs b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100755
index 0000000..b2260f8
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Warning
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_FIELD=Warning
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Warning
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Warning
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Ignore
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Ignore
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Warning
+automatically_removed_unused_problem_filters=Enabled
+changed_execution_env=Warning
+eclipse.preferences.version=1
+incompatible_api_component_version=Warning
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+incompatible_api_component_version_report_major_without_breaking_change=Error
+incompatible_api_component_version_report_minor_without_api_change=Error
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/META-INF/MANIFEST.MF
new file mode 100755
index 0000000..205b1d7
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Papyrus-Model2Doc - Integration EMF DocumentStructureTemplate Types (Incubation)
+Bundle-SymbolicName: org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types;singleton:=true
+Bundle-Version: 0.7.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Automatic-Module-Name: org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.model2doc.emf.documentstructuretemplate;bundle-version="[0.7.0,1.0.0)"
+Export-Package: org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.internal.advices
+Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/about.html b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/about.html
new file mode 100755
index 0000000..ef2872f
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>November 30, 2017</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/build.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/build.properties
new file mode 100755
index 0000000..e3afcde
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               resources/
+src.includes = about.html
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/pom.xml b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/pom.xml
new file mode 100755
index 0000000..068689e
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.papyrus.model2doc.plugins-integration</groupId>
+		<artifactId>org.eclipse.papyrus.model2doc.plugins.integration</artifactId>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations
new file mode 100755
index 0000000..ff3d2a8
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmi:id="_--FKQKJQEemnzshfQ11WZw" identifier="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.elementTypeSet" name="DocumentTemplateContext" metamodelNsURI="http://www.eclipse.org/emf/2002/Ecore">
+  <adviceBindingsConfigurations xmi:type="elementtypesconfigurations:AdviceBindingConfiguration" xmi:id="_LU1EgKJREemnzshfQ11WZw" description="Advice to remove a DocumentTemplate when its semanticContext is deleted." identifier="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.internal.advices.DeleteDocumentTemplateSemanticContextAdvice" inheritance="all" editHelperAdviceClassName="org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.internal.advices.DeleteDocumentTemplateSemanticContextAdvice"/>
+</elementtypesconfigurations:ElementTypeSetConfiguration>
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/src/org/eclipse/papyrus/model2doc/integration/emf/documentstructuretemplate/types/internal/advices/DeleteDocumentTemplateSemanticContextAdvice.java b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/src/org/eclipse/papyrus/model2doc/integration/emf/documentstructuretemplate/types/internal/advices/DeleteDocumentTemplateSemanticContextAdvice.java
new file mode 100755
index 0000000..785cc1a
--- /dev/null
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/src/org/eclipse/papyrus/model2doc/integration/emf/documentstructuretemplate/types/internal/advices/DeleteDocumentTemplateSemanticContextAdvice.java
@@ -0,0 +1,88 @@
+/*****************************************************************************
+ * Copyright (c) 2019 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.internal.advices;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
+import org.eclipse.gmf.runtime.common.core.command.CompositeCommand;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.DocumentStructureTemplatePackage;
+import org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.DocumentTemplate;
+
+/**
+ * This helper is in charge to delete de DocumentStructure associated to the deleted semantic element
+ */
+public class DeleteDocumentTemplateSemanticContextAdvice extends AbstractEditHelperAdvice {
+
+	/**
+	 *
+	 * @see org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice#getBeforeDestroyDependentsCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyDependentsRequest)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@Override
+	protected ICommand getBeforeDestroyDependentsCommand(DestroyDependentsRequest request) {
+		final EObject objectToDestroy = request.getElementToDestroy();
+		if (objectToDestroy == null) {
+			return null;
+		}
+
+		final ECrossReferenceAdapter crossReferencerAdapter = ECrossReferenceAdapter
+				.getCrossReferenceAdapter(objectToDestroy);
+		if (crossReferencerAdapter != null) {
+			final Collection<Setting> settings = crossReferencerAdapter
+					.getNonNavigableInverseReferences(objectToDestroy);
+			CompositeCommand cmd = new CompositeCommand("Destroy DocumentTemplate Command"); //$NON-NLS-1$
+			for (Setting currentSetting : settings) {
+				final EObject currentEObject = currentSetting.getEObject();
+				final EStructuralFeature currentfeature = currentSetting.getEStructuralFeature();
+				if (currentEObject instanceof DocumentTemplate
+						&& currentfeature == DocumentStructureTemplatePackage.eINSTANCE
+								.getDocumentTemplate_SemanticContext()) {
+					final DocumentTemplate docTemplate = (DocumentTemplate) currentEObject;
+					final IElementEditService docTemplateProvider = ElementEditServiceUtils.getCommandProvider(docTemplate);
+
+					// for a better behavior, we set the semantic context to null
+					SetRequest setRequest = new SetRequest(docTemplate, DocumentStructureTemplatePackage.eINSTANCE.getDocumentTemplate_SemanticContext(), null);
+					cmd.add(docTemplateProvider.getEditCommand(setRequest));
+
+					// for a better behavior, we set the semantic context to null
+					setRequest = new SetRequest(currentEObject, DocumentStructureTemplatePackage.eINSTANCE.getDocumentTemplate_GraphicalContext(), null);
+					cmd.add(docTemplateProvider.getEditCommand(setRequest));
+
+					final DestroyElementRequest destroyRequest = new DestroyElementRequest(docTemplate, false);
+					cmd.add(docTemplateProvider.getEditCommand(destroyRequest));
+
+				}
+			}
+			if (!cmd.isEmpty()) {
+				return cmd;
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui/OSGI-INF/l10n/bundle.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui/OSGI-INF/l10n/bundle.properties
index 787b8de..bf438f9 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui/OSGI-INF/l10n/bundle.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Papyrus-Model2Doc EMF DocumentStructureTemplate Integration UI (Incubation)
\ No newline at end of file
+Bundle-Name = Papyrus-Model2Doc - EMF DocumentStructureTemplate Integration UI (Incubation)
\ No newline at end of file
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
index 58879ec..d8999ef 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc GMF DocumentStructureTemplate Integration Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - GMF DocumentStructureTemplate Integration Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/plugin.properties b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/plugin.properties
index 40254d9..2f79b78 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/plugin.properties
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc GMF DocumentStructureTemplate Integration (Incubation)
+pluginName = Papyrus-Model2Doc - GMF DocumentStructureTemplate Integration (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
index 3d77129..ea37cff 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.gmf.template2structure/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc GMF Template2structure Integration (Incubation)
+Bundle-Name: Papyrus-Model2Doc - GMF Template2structure Integration (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.integration.gmf.template2structure;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.integration.gmf.template2structure.Activator
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/META-INF/MANIFEST.MF b/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/META-INF/MANIFEST.MF
index 3ca38d2..9bf9799 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Payrus-Model2Doc UML Architecture Integration (Incubation)
+Bundle-Name: Papyrus-Model2Doc - UML Architecture Integration (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.integration.uml.architecture;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
@@ -16,7 +16,8 @@
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation;bundle-version="[0.7.0,1.0.0)",
  org.eclipse.papyrus.model2doc.core.generatorconfiguration;bundle-version="[0.7.0,1.0.0)",
- org.eclipse.papyrus.emf.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.emf.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types;bundle-version="[0.7.0,1.0.0)"
 Export-Package: org.eclipse.papyrus.model2doc.integration.uml.architecture
 Bundle-Activator: org.eclipse.papyrus.model2doc.integration.uml.architecture.internal.messages.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/resources/umlDocument.architecture b/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/resources/umlDocument.architecture
index 77a1c8b..2b97019 100755
--- a/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/resources/umlDocument.architecture
+++ b/plugins/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture/resources/umlDocument.architecture
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:representation="http://www.eclipse.org/papyrus/model2doc/integration/1.0.0/emf/documentstructuretemplate/representation" xmlns:representation_1="http://www.eclipse.org/papyrus/infra/core/architecture/representation" xmi:id="_pNW38LaHEeiKuPQLywy7Og" id="org.eclipse.papyrus.softwareEngineering" name="Software Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/domain.gif">
+<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:documentstructuretemplate="http://www.eclipse.org/papyrus/model2doc/emf/1.0.0/documentstructuretemplate" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:representation="http://www.eclipse.org/papyrus/model2doc/integration/1.0.0/emf/documentstructuretemplate/representation" xmlns:representation_1="http://www.eclipse.org/papyrus/infra/core/architecture/representation" xmi:id="_pNW38LaHEeiKuPQLywy7Og" id="org.eclipse.papyrus.softwareEngineering" name="Software Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/domain.gif">
   <contexts xmi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="_-tAb0Lp2EeiViqj5DY8SRQ" id="org.eclipse.papyrus.infra.services.edit.TypeContext" name="UML">
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_1tp4cOEIEeiLVapXeWCJtQ" id="org.eclipse.papyrus.uml.analysis" name="Software Analysis" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_xPrtEDoEEemsSYTK9MkLEw _BJt4YJ2QEemiMq28jYkwqQ"/>
     <viewpoints xmi:type="architecture:ArchitectureViewpoint" xmi:id="_dmWHgLp3EeiViqj5DY8SRQ" id="org.eclipse.papyrus.uml.design" name="Software Design" description="" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/viewpoint.gif" representationKinds="_xPrtEDoEEemsSYTK9MkLEw _BJt4YJ2QEemiMq28jYkwqQ"/>
+    <elementTypes xmi:type="elementtypesconfigurations:ElementTypeSetConfiguration" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types/resources/documenttemplate-context.elementtypesconfigurations#_--FKQKJQEemnzshfQ11WZw"/>
     <representationKinds xmi:type="representation:PapyrusDocumentPrototype" xmi:id="_xPrtEDoEEemsSYTK9MkLEw" id="org.eclipse.papyrus.model2doc.uml.architecture" name="Generic Text Document" description="Generate generic odt document from UML models." icon="platform:/plugin/org.eclipse.papyrus.model2doc.integration.uml.architecture/icons/generic_document.png" implementationID="GenericUMLDocumentStructureTemplate" creationCommandClass="org.eclipse.papyrus.model2doc.integration.uml.architecture.CreatePapyrusDocumentTemplateEditorCommand">
       <modelRules xmi:type="representation_1:ModelRule" xmi:id="_6Rfr0DoEEemsSYTK9MkLEw" permit="true" elementMultiplicity="1" multiplicity="-1">
         <element xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement"/>
@@ -21,6 +22,6 @@
       </owningRules>
       <documentTemplatePrototype xmi:type="documentstructuretemplate:DocumentTemplatePrototype" href="platform:/plugin/org.eclipse.papyrus.model2doc.integration.uml.architecture/resources/emptyTextDocumentPrototype.pdst#_N7ViMD6EEemyE7d-JqIr-B"/>
     </representationKinds>
-    <metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/Types#/"/>
+    <metamodel xmi:type="ecore:EPackage" href="http://www.eclipse.org/uml2/5.0.0/UML#/"/>
   </contexts>
 </architecture:ArchitectureDomain>
diff --git a/plugins/integration/pom.xml b/plugins/integration/pom.xml
index bb9db91..346565c 100755
--- a/plugins/integration/pom.xml
+++ b/plugins/integration/pom.xml
@@ -25,6 +25,7 @@
 		<module>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.properties</module>
 		<module>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation</module>
 		<module>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.representation.edit</module>
+		<module>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types</module>
 		<module>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.ui</module>
 		<module>org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate</module>
 		<module>org.eclipse.papyrus.model2doc.integration.gmf.documentstructuretemplate.edit</module>
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt.architecture/plugin.properties b/plugins/odt/org.eclipse.papyrus.model2doc.odt.architecture/plugin.properties
index 280da8b..76b294b 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt.architecture/plugin.properties
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt.architecture/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc ODT Architecture (Incubation)
+pluginName = Papyrus-Model2Doc - ODT Architecture (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt.emf.structure2document/META-INF/MANIFEST.MF b/plugins/odt/org.eclipse.papyrus.model2doc.odt.emf.structure2document/META-INF/MANIFEST.MF
index c075127..a78ec34 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt.emf.structure2document/META-INF/MANIFEST.MF
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt.emf.structure2document/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2doc ODT EMF Structure To Document (Incubation)
+Bundle-Name: Papyrus-Model2Doc - ODT EMF Structure To Document (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.odt.emf.structure2document;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.odt.emf.structure2document.Activator
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt.lib/plugin.properties b/plugins/odt/org.eclipse.papyrus.model2doc.odt.lib/plugin.properties
index de29318..6fb6cac 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt.lib/plugin.properties
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt.lib/plugin.properties
@@ -1,4 +1,14 @@
-#
-
-pluginName = Papyrus Model2Doc ODT Lib (Incubation)
+# Copyright (c) 2019 CEA LIST.
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License 2.0
+#  which accompanies this distribution, and is available at
+#  https://www.eclipse.org/legal/epl-2.0/
+# 
+#  SPDX-License-Identifier: EPL-2.0
+# 
+#  Contributors:
+#  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
+#  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+pluginName = Papyrus-Model2Doc - ODT Libraries (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt.ui/plugin.properties b/plugins/odt/org.eclipse.papyrus.model2doc.odt.ui/plugin.properties
index f9f24a2..d9ae37a 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt.ui/plugin.properties
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt.ui/plugin.properties
@@ -12,5 +12,5 @@
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
 
-pluginName = Papyrus Model2Doc ODT UI (Incubation)
+pluginName = Papyrus-Model2Doc - ODT UI (Incubation)
 providerName = Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/odt/org.eclipse.papyrus.model2doc.odt/plugin.properties b/plugins/odt/org.eclipse.papyrus.model2doc.odt/plugin.properties
index 64cf3c1..9640a75 100755
--- a/plugins/odt/org.eclipse.papyrus.model2doc.odt/plugin.properties
+++ b/plugins/odt/org.eclipse.papyrus.model2doc.odt/plugin.properties
@@ -11,5 +11,5 @@
 #  Yupanqui Munoz (CEA LIST) yupanqui.munozjulho@cea.fr - Initial API and implementation
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus Model2Doc ODT (Incubation)
+pluginName = Papyrus-Model2Doc - ODT (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate.edit/plugin.properties b/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate.edit/plugin.properties
index 4b4c855..3aa2ba5 100755
--- a/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate.edit/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate.edit/plugin.properties
@@ -10,7 +10,7 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc UML DocumentStructureTemplate Edit Support (Incubation)
+pluginName = Papyrus-Model2Doc - UML DocumentStructureTemplate Edit Support (Incubation)
 providerName = Eclipse Modeling Project
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate/plugin.properties b/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate/plugin.properties
index b59b0f6..fbc7414 100755
--- a/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate/plugin.properties
+++ b/plugins/uml/org.eclipse.papyrus.model2doc.uml.documentstructuretemplate/plugin.properties
@@ -10,5 +10,5 @@
 #  Contributors:
 #  Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
 
-pluginName = Papyrus-Model2Doc UML Document Structure Template (Incubation)
+pluginName = Papyrus-Model2Doc - UML Document Structure Template (Incubation)
 providerName = Eclipse Modeling Project
diff --git a/plugins/uml/org.eclipse.papyrus.model2doc.uml.template2structure/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.model2doc.uml.template2structure/META-INF/MANIFEST.MF
index 312a448..c0a7963 100755
--- a/plugins/uml/org.eclipse.papyrus.model2doc.uml.template2structure/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.model2doc.uml.template2structure/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc UML Structure2Document (Incubation)
+Bundle-Name: Papyrus-Model2Doc - UML Structure2Document (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.uml.template2structure;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.uml.template2structure.Activator
diff --git a/tests/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests/META-INF/MANIFEST.MF b/tests/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests/META-INF/MANIFEST.MF
index 11a2730..50cc7c3 100755
--- a/tests/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests/META-INF/MANIFEST.MF
+++ b/tests/emf/org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc EMF DocumentStructureTemplate Tests (Incubation)
+Bundle-Name: Papyrus-Model2Doc - EMF DocumentStructureTemplate Tests (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.model2doc.emf.documentstructuretemplate.tests.Activator
diff --git a/tests/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.tests/.project b/tests/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.tests/.project
new file mode 100755
index 0000000..17842b9
--- /dev/null
+++ b/tests/integration/org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.model2doc.integration.emf.documentstructuretemplate.types.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF b/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
index 7b577f4..3ddac81 100755
--- a/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
+++ b/tests/integration/org.eclipse.papyrus.model2doc.integration.uml.architecture.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus-Model2Doc Integration Architecture Tests
+Bundle-Name: Papyrus-Model2Doc - Integration Architecture Tests (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.integration.uml.architecture.tests;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.papyrus.model2doc.uml.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.papyrus.model2doc.uml.tests/META-INF/MANIFEST.MF
index 322493a..b3ee9e7 100755
--- a/tests/org.eclipse.papyrus.model2doc.uml.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.papyrus.model2doc.uml.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Papyrus model2Doc Tests
+Bundle-Name: Papyrus-Model2Doc - UML Tests (Incubation)
 Bundle-SymbolicName: org.eclipse.papyrus.model2doc.uml.tests
-Bundle-Version: 01.7.0.qualifier
+Bundle-Version: 0.7.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Automatic-Module-Name: org.eclipse.papyrus.model2doc.uml.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.papyrus.model2doc.uml.tests/build.properties b/tests/org.eclipse.papyrus.model2doc.uml.tests/build.properties
index 34d2e4d..9cbab3c 100755
--- a/tests/org.eclipse.papyrus.model2doc.uml.tests/build.properties
+++ b/tests/org.eclipse.papyrus.model2doc.uml.tests/build.properties
@@ -1,4 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               about.html
+src.includes = about.html