diff --git a/packaging/org.obeonetwork.dsl.uml2.core.update/category.xml b/packaging/org.obeonetwork.dsl.uml2.core.update/category.xml
index 0a6198b00..9e2ad7e5f 100644
--- a/packaging/org.obeonetwork.dsl.uml2.core.update/category.xml
+++ b/packaging/org.obeonetwork.dsl.uml2.core.update/category.xml
@@ -9,6 +9,9 @@
    <feature url="features/org.obeonetwork.dsl.uml2.core.runtime.sdk.feature_8.0.0.qualifier.jar" id="org.obeonetwork.dsl.uml2.core.runtime.sdk.feature" version="8.0.0.qualifier">
       <category name="Obeo Network"/>
    </feature>
+   <feature id="org.obeonetwork.gmf.runtime.diagram.ui.extension.feature" version="0.0.0">
+         <category name="Obeo Network"/>
+   </feature>
    <category-def name="Obeo Network" label="Obeo Network">
       <description>
          The Obeo Network.
diff --git a/packaging/org.obeonetwork.dsl.uml2.update/category.xml b/packaging/org.obeonetwork.dsl.uml2.update/category.xml
index 5965987dc..35898fcd1 100644
--- a/packaging/org.obeonetwork.dsl.uml2.update/category.xml
+++ b/packaging/org.obeonetwork.dsl.uml2.update/category.xml
@@ -12,8 +12,6 @@
    <feature id="org.obeonetwork.dsl.uml2.runtime.product.feature" version="0.0.0">
       <category name="Obeo Network"/>
    </feature>
-   <feature id="org.obeonetwork.gmf.runtime.diagram.ui.extension.feature" version="0.0.0">
-   </feature>
    <feature id="org.obeonetwork.dsl.uml2.umlgen.feature" version="0.0.0">
       <category name="Obeo Network"/>
    </feature>
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.uml2.core.design/META-INF/MANIFEST.MF
index c7002d905..76982eddf 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/META-INF/MANIFEST.MF
@@ -15,14 +15,14 @@ Require-Bundle: com.google.guava,
  org.eclipse.jdt.core,
  org.eclipse.jface,
  org.eclipse.pde.core,
- org.eclipse.sirius;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.common;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ecore.extender;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.sirius;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.common;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.diagram;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ecore.extender;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ui;bundle-version="[5.0.0,6.1.0)",
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.navigator,
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties b/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
index 76fea8e01..3d74c5b16 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                description/,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign b/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
index f41fb9c53..c2ec3cd9f 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/description/uml2core.odesign
@@ -14,7 +14,7 @@
           </style>
         </nodeMappings>
         <nodeMappings name="Empty Diagram" preconditionExpression="service:diagram.isDiagramEmpty" deletionDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='delete']/@ownedTools[name='RED_NoOp']" semanticCandidatesExpression="var:self" doubleClickDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Add%20direct%20children']" domainClass="uml.Element">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.design/icons/empty.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -69,7 +69,7 @@
       </defaultLayer>
       <toolSection documentation="reused tools" name="reused tools">
         <subSections name="existingElements">
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -104,7 +104,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -311,7 +311,7 @@
             </menuItemDescription>
           </ownedTools>
           <ownedTools xsi:type="tool:PopupMenu" name="Delete" label="Delete" precondition="service:containerView.isNotDiagram">
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:views">
@@ -321,7 +321,7 @@
                 </firstModelOperations>
               </initialOperation>
             </menuItemDescription>
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views->filter(viewpoint::DSemanticDecorator).target.destroy()"/>
@@ -408,7 +408,7 @@
           <conditionnalStyles predicateExpression="aql:self.interrupts->filter(ecore::EObject)->size() > 0">
             <style routingStyle="manhattan">
               <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
-              <centerLabelStyleDescription labelExpression="." iconPath="/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png">
+              <centerLabelStyleDescription labelExpression="." iconPath="/org.obeonetwork.dsl.core.uml2.design/icons/InterruptibleEdgeIcon.png">
                 <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
               </centerLabelStyleDescription>
             </style>
@@ -2986,7 +2986,7 @@
               </subModelOperations>
               <subModelOperations xsi:type="tool:If" conditionExpression="aql: not self.isRemovableAttribute(selection) and selection->size()=1">
                 <subModelOperations xsi:type="tool:Let" variableName="parent" valueExpression="var:self">
-                  <subModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:selection->at(1)">
+                  <subModelOperations xsi:type="tool:Let" variableName="attribute" valueExpression="aql:selection->at(1)">
                     <subModelOperations xsi:type="tool:If" conditionExpression="aql:onClickEventKind='DOUBLE_CLICK'">
                       <subModelOperations xsi:type="properties:DialogModelOperation" titleExpression="Edit">
                         <buttons labelExpression="Cancel" closeDialogOnClick="true" rollbackChangesOnClose="true">
@@ -2997,7 +2997,7 @@
                         </buttons>
                         <page name="Default Page" labelExpression="aql:self.computeUmlLabel()" semanticCandidateExpression="var:self" groups="//@extensions.0/@categories.0/@groups.1/@controls.0/@onClickOperation/@firstModelOperations/@subModelOperations.1/@subModelOperations.0/@subModelOperations.0/@subModelOperations.0/@subModelOperations.0/@groups.0"/>
                         <groups name="TaggedValuesEdition" labelExpression="Tagged Values" semanticCandidateExpression="var:self">
-                          <controls xsi:type="properties:DynamicMappingForDescription" name="sirius_default_rules_structural_features_for" iterator="eStructuralFeature" iterableExpression="aql:self->asSequence()">
+                          <controls xsi:type="properties:DynamicMappingForDescription" name="sirius_default_rules_structural_features_for" iterator="eStructuralFeature" iterableExpression="aql:attribute->asSequence()">
                             <ifs name="tagged_values_rules_mono_string_if" predicateExpression="aql:input.emfEditServices(parent).needsTextWidget(eStructuralFeature) and not input.emfEditServices(parent).isMultiline(eStructuralFeature)">
                               <widget xsi:type="properties:TextDescription" name="tagged_values_rules_mono_string" labelExpression="aql:eStructuralFeature.name+':'" helpExpression="aql:eStructuralFeature.getHelp(parent))" isEnabledExpression="aql:eStructuralFeature.changeable" valueExpression="aql:eStructuralFeature.getTaggedValuesValue(parent)">
                                 <initialOperation>
@@ -3061,7 +3061,7 @@
               </subModelOperations>
             </firstModelOperations>
           </onClickOperation>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool:If" conditionExpression="aql:self.isAttributesOwner()">
@@ -3070,7 +3070,7 @@
               </firstModelOperations>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:self">
                 <subModelOperations xsi:type="tool:If" conditionExpression="aql: self.isRemovableAttribute(selection)">
@@ -3081,12 +3081,12 @@
               </firstModelOperations>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:selection.organizeUpAttributes(self, true)"/>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:selection.organizeUpAttributes(self, false)"/>
             </initialOperation>
@@ -3195,12 +3195,12 @@
             <layout xsi:type="properties:GridLayoutDescription" numberOfColumns="6"/>
           </controls>
         </controls>
-        <actions tooltipExpression="Add a new association end" imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+        <actions tooltipExpression="Add a new association end" imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
           <initialOperation>
             <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.addAssociationEnd()"/>
           </initialOperation>
         </actions>
-        <actions tooltipExpression="Remove ends" imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+        <actions tooltipExpression="Remove ends" imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
           <initialOperation>
             <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.removeAssociationEnd()"/>
           </initialOperation>
@@ -3225,12 +3225,12 @@
       </groups>
       <groups name="PR_StereotypesGroup" labelExpression="Stereotypes" domainClass="uml::Element" semanticCandidateExpression="var:self">
         <controls xsi:type="properties:ListDescription" name="Stereotypes" label="Stereotypes" labelExpression="Applied Stereotypes:" helpExpression="The Stereotypes applied to the Element" valueExpression="aql:self.oclAsType(uml::Element).getAppliedStereotypes()" displayExpression="aql:value.computeUmlLabel()">
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:selectStereotype()"/>
             </initialOperation>
           </actions>
-          <actions imageExpression="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <actions imageExpression="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:self.unapplyStereotypes(selection)"/>
             </initialOperation>
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/InterruptibleEdgeIcon.png
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/InterruptibleEdgeIcon.png
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/InterruptibleEdgeIcon.png
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif
new file mode 100644
index 000000000..12f8fc40b
Binary files /dev/null and b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif differ
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/empty.svg b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/empty.svg
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/down.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/down.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif b/plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif
similarity index 100%
rename from plugins/org.obeonetwork.dsl.uml2.design/icons/properties/up.gif
rename to plugins/org.obeonetwork.dsl.uml2.core.design/icons/properties/up.gif
diff --git a/plugins/org.obeonetwork.dsl.uml2.core.design/src/org/obeonetwork/dsl/uml2/core/api/services/PropertiesViewServices.java b/plugins/org.obeonetwork.dsl.uml2.core.design/src/org/obeonetwork/dsl/uml2/core/api/services/PropertiesViewServices.java
index 5f9b80731..e3a64dc48 100644
--- a/plugins/org.obeonetwork.dsl.uml2.core.design/src/org/obeonetwork/dsl/uml2/core/api/services/PropertiesViewServices.java
+++ b/plugins/org.obeonetwork.dsl.uml2.core.design/src/org/obeonetwork/dsl/uml2/core/api/services/PropertiesViewServices.java
@@ -83,6 +83,15 @@
  * @author Frederic Bats <a href="mailto:emailadress">frederic.bats@obeo.fr</a>
  */
 public class PropertiesViewServices {
+    /**
+     * Open quote mark.
+     */
+    public static final String OPEN_QUOTE_MARK = "\u00AB"; //$NON-NLS-1$
+
+    /**
+     * Close quote mark.
+     */
+    public static final String CLOSE_QUOTE_MARK = "\u00BB"; //$NON-NLS-1$
 
     /**
      * Add association end.
@@ -244,7 +253,8 @@ public String getAttributesLabel(EObject element, Element umlElement) {
             }
             final String type = ((EStructuralFeature) element).getEType().getName();
 
-            return " «" + stereotypeName + "» :: " + ((EStructuralFeature) element).getName() + " : " + type; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+            return OPEN_QUOTE_MARK + stereotypeName + CLOSE_QUOTE_MARK + " :: " + ((EStructuralFeature) element).getName() + " : " + type; //$NON-NLS-1$ //$NON-NLS-2$
+                                                                                                                                           // //$NON-NLS-3$
         }
         return "undefined name"; //$NON-NLS-1$
     }
diff --git a/plugins/org.obeonetwork.dsl.uml2.dashboard/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.uml2.dashboard/META-INF/MANIFEST.MF
index f93926a88..a82745271 100644
--- a/plugins/org.obeonetwork.dsl.uml2.dashboard/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.uml2.dashboard/META-INF/MANIFEST.MF
@@ -7,14 +7,14 @@ Bundle-Activator: org.obeonetwork.dsl.uml2.dashboard.DashboardPlugin
 Bundle-Vendor: Obeo
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.sirius.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.sirius.ui;bundle-version="[5.0.0,6.1.0)",
  org.eclipse.emf.transaction,
- org.eclipse.amalgam.explorer.activity.ui;bundle-version="[1.8.0,1.9.0)",
- org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,5.4.0)",
+ org.eclipse.amalgam.explorer.activity.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.uml2.uml.edit,
  org.eclipse.gmf.runtime.diagram.ui,
  com.google.guava;bundle-version="[21.0.0,22.0.0)",
- org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.1.0)",
  org.eclipse.core.expressions
 Export-Package: org.obeonetwork.dsl.uml2.dashboard.services
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.obeonetwork.dsl.uml2.dashboard/plugin.xml b/plugins/org.obeonetwork.dsl.uml2.dashboard/plugin.xml
index 1b15d8b0c..efc3a673e 100644
--- a/plugins/org.obeonetwork.dsl.uml2.dashboard/plugin.xml
+++ b/plugins/org.obeonetwork.dsl.uml2.dashboard/plugin.xml
@@ -585,8 +585,8 @@ Capture (Package hierarchy, Use case diagram…), Design (Class diagram, Activit
             %documentation.description
          </Description>
          <Overview
-               imageOff="icons/documentation/HelpSelected.png"
-               imageOn="icons/documentation/HelpOff.png">
+               imageOn="icons/documentation/HelpSelected.png"
+               imageOff="icons/documentation/HelpOff.png">
             <Description>
                &lt;p&gt;&lt;b&gt;Help&lt;/b&gt;&lt;br/&gt;Find help, the reference documentations and the support entry points.&lt;/p&gt;
             </Description>
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/.classpath b/plugins/org.obeonetwork.dsl.uml2.design/.classpath
index 64c5e31b7..eca7bdba8 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/.classpath
+++ b/plugins/org.obeonetwork.dsl.uml2.design/.classpath
@@ -1,6 +1,6 @@
 <?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/J2SE-1.5"/>
+	<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"/>
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/.settings/org.eclipse.jdt.core.prefs b/plugins/org.obeonetwork.dsl.uml2.design/.settings/org.eclipse.jdt.core.prefs
index 424f04803..4d2d60b58 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.obeonetwork.dsl.uml2.design/.settings/org.eclipse.jdt.core.prefs
@@ -17,9 +17,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 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.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+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
@@ -121,7 +121,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+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
@@ -206,7 +206,6 @@ org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=8
 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_member=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
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/META-INF/MANIFEST.MF b/plugins/org.obeonetwork.dsl.uml2.design/META-INF/MANIFEST.MF
index 7dfaea3cd..2e7d78c50 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/META-INF/MANIFEST.MF
+++ b/plugins/org.obeonetwork.dsl.uml2.design/META-INF/MANIFEST.MF
@@ -17,21 +17,21 @@ Require-Bundle: com.google.guava;bundle-version="[21.0.0,22.0.0)",
  org.eclipse.gmf.runtime.gef.ui,
  org.eclipse.jdt.core,
  org.eclipse.pde.ui,
- org.eclipse.sirius;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.common;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram.sequence.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ecore.extender;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties.core;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties.defaultrules;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties.edit;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.properties.ext.widgets.reference.edit;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.sirius.ui;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.sirius;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.common;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.common.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.diagram.sequence;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.diagram.sequence.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.diagram.ui;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ecore.extender;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ext.base;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties.core;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties.defaultrules;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties.edit;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties.ext.widgets.reference;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.properties.ext.widgets.reference.edit;bundle-version="[5.0.0,6.1.0)",
+ org.eclipse.sirius.ui;bundle-version="[5.0.0,6.1.0)",
  org.eclipse.sirius.ui.properties;bundle-version="5.0.1",
  org.eclipse.sirius.ui.properties.ext.widgets.reference;bundle-version="5.0.1",
  org.eclipse.ui,
diff --git a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
index 4916c651e..458d645af 100644
--- a/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
+++ b/plugins/org.obeonetwork.dsl.uml2.design/description/uml2.odesign
@@ -14,7 +14,7 @@
           </style>
         </nodeMappings>
         <nodeMappings name="Empty Diagram" preconditionExpression="service:diagram.isDiagramEmpty" deletionDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='delete']/@ownedTools[name='RED_NoOp']" semanticCandidatesExpression="var:self" doubleClickDescription="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Add%20direct%20children']" domainClass="uml.Element">
-          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.design/icons/empty.svg">
+          <style xsi:type="style:WorkspaceImageDescription" showIcon="false" labelExpression="" sizeComputationExpression="-1" labelPosition="node" resizeKind="NSEW" workspacePath="/org.obeonetwork.dsl.uml2.core.design/icons/empty.svg">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
           </style>
@@ -30,7 +30,7 @@
       </defaultLayer>
       <toolSection documentation="reused tools" name="reused tools">
         <subSections name="existingElements">
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Add existing elements to the diagram" name="AddExistingElements" label="Add" precondition="service:containerView.isValidContainerMapping" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -74,7 +74,7 @@
               </firstModelOperations>
             </initialOperation>
           </ownedTools>
-          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+          <ownedTools xsi:type="tool:ToolDescription" documentation="Remove an existing element from the diagram" name="RemoveExistingElements" label="Remove" precondition="service:containerView.isNotDiagram" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
             <element name="element"/>
             <elementView name="elementView"/>
             <initialOperation>
@@ -512,7 +512,7 @@
             </menuItemDescription>
           </ownedTools>
           <ownedTools xsi:type="tool:PopupMenu" name="Delete" label="Delete" precondition="service:containerView.isNotDiagram">
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/unset.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Diagram" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/unset.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="var:views">
@@ -522,7 +522,7 @@
                 </firstModelOperations>
               </initialOperation>
             </menuItemDescription>
-            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.design/icons/deleteModel.gif">
+            <menuItemDescription xsi:type="tool:OperationAction" name="from Model" icon="/org.obeonetwork.dsl.uml2.core.design/icons/deleteModel.gif">
               <view name="views"/>
               <initialOperation>
                 <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="aql:views->filter(viewpoint::DSemanticDecorator).target.destroy()"/>
@@ -655,7 +655,7 @@
           </style>
         </edgeMappings>
         <toolSections name="PH_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="PH_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="PH_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -957,7 +957,7 @@
           </style>
         </containerMappings>
         <toolSections name="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to diagram" name="UCD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to diagram" name="UCD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:For" expression="aql:views->filter(viewpoint::DSemanticDecorator)">
@@ -1604,7 +1604,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CD_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements" name="CD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements" name="CD_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -2978,7 +2978,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CS_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CS_AddRelatedElements" label="Add Related Elements" precondition="aql:self.oclIsKindOf(uml::Interface) or self.oclIsKindOf(uml::Port) or self.oclIsKindOf(uml::EncapsulatedClassifier) or self.oclIsKindOf(uml::PackageableElement)" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CS_AddRelatedElements" label="Add Related Elements" precondition="aql:self.oclIsKindOf(uml::Interface) or self.oclIsKindOf(uml::Port) or self.oclIsKindOf(uml::EncapsulatedClassifier) or self.oclIsKindOf(uml::PackageableElement)" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -3341,7 +3341,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="CO_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CO_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="CO_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -3808,7 +3808,7 @@
           </conditionnalStyles>
         </containerMappings>
         <toolSections name="DE_ExistingElements" label="Existing Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='AddExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='RemoveExistingElements'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Paste'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20TreeView'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='existingElements']/@ownedTools[name='Drop%20From%20Diagram'] //@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Delete']">
-          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="DE_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif">
+          <ownedTools xsi:type="tool:OperationAction" documentation="Add related elements to the diagram" name="DE_AddRelatedElements" label="Add Related Elements" forceRefresh="true" icon="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif">
             <view name="views"/>
             <initialOperation>
               <firstModelOperations xsi:type="tool:ChangeContext" browseExpression="service:views.getTarget">
@@ -4698,7 +4698,7 @@
           </style>
         </containerMappings>
         <toolSections name="Elements" reusedTools="//@ownedViewpoints[name='Reused']/@ownedRepresentations[name='Reused%20Description']/@toolSection/@subSections[name='popup%20menu']/@ownedTools[name='Move%20UP%2FDOWN%20TO%20Elements']">
-          <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" documentation="Move an element" name="PC_ArrangeContainment" label="Move" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.design/icons/properties/create.gif" message="Select elements contained in the current package" choiceOfValuesMessage="Candidate packageable elements" candidatesExpression="service:getAllPackageableElements" tree="true" rootExpression="service:getAllAvailableRootPackages" childrenExpression="feature:eContents" selectedValuesMessage="Selected packageable elements" preSelectedCandidatesExpression="aql:container.packagedElement">
+          <ownedTools xsi:type="tool:PaneBasedSelectionWizardDescription" documentation="Move an element" name="PC_ArrangeContainment" label="Move" forceRefresh="true" iconPath="/org.obeonetwork.dsl.uml2.core.design/icons/properties/create.gif" message="Select elements contained in the current package" choiceOfValuesMessage="Candidate packageable elements" candidatesExpression="service:getAllPackageableElements" tree="true" rootExpression="service:getAllAvailableRootPackages" childrenExpression="feature:eContents" selectedValuesMessage="Selected packageable elements" preSelectedCandidatesExpression="aql:container.packagedElement">
             <element name="elements"/>
             <containerView name="containerView"/>
             <container name="container"/>