Bug 465269 - [SysML 1.4] Remove deprecated element-type

  - remove elementtypes comming from deprecated stereotype
  - apply deprecated stereotype to FlowPort, Flow Specification and
Allocated
  - update elementtypes, palette and tests files

Change-Id: I6c173adc5ac495812fd062d3ae23acc5046bd111
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Reviewed-on: https://git.eclipse.org/r/46327
Tested-by: Hudson CI

10 files changed, 2192 insertions, 1867 deletions

diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
index c58f1998577..a063c53a6d5 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDiagram.paletteconfiguration
@@ -266,111 +266,6 @@
         kind="ConnectionTool"/>
   </drawerConfigurations>
   <drawerConfigurations
-      id="Deprecated"
-      label="Deprecated"
-      description="Deprecated">
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_Property"
-        label="Property (Deprecated)"
-        description="Create a Deprecated Property">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3002"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3005"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3006"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3012"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3018"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification"
-        label="InstanceSpecification (Deprecated)"
-        description="Create a Deprecated InstanceSpecification">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/InstanceSpecification.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_Class"
-        label="Class (Deprecated)"
-        description="Create a Deprecated Class">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_2008"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3004"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3008"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3010"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_Association"
-        label="Association (Deprecated)"
-        description="Create a Deprecated Association"
-        kind="ConnectionTool">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Association.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_2015"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4001"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4019"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_Generalization"
-        label="Generalization (Deprecated)"
-        description="Create a Deprecated Generalization"
-        kind="ConnectionTool">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="org.eclipse.papyrus.sysML.Deprecated_DataType"
-        label="DataType (Deprecated)"
-        description="Create a Deprecated DataType">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/DataType.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"/>
-    </ownedConfigurations>
-  </drawerConfigurations>
-  <drawerConfigurations
       id="Nodes"
       label="Other Nodes"
       description="Other Nodes">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations
index a4f199857d5..3dea3ff4bd6 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeStructureDiagram.elementtypesconfigurations
@@ -1,349 +1,822 @@
 <?xml version="1.0" encoding="ASCII"?>
-<elementtypesconfigurations:ElementTypeSetConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0" xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration" xmi:id="_Qt9c4Mv4EeS5BpE3hOblyw" name="SysML" identifier="org.eclipse.papyrus.SysML14.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c4cv4EeS5BpE3hOblyw" name="ValueType (3080)" identifier="org.eclipse.papyrus.SysML14.ValueType_3080" hint="3080">
-    <iconEntry xmi:id="_Qt9c4sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+<elementtypesconfigurations:ElementTypeSetConfiguration
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:applystereotypeadviceconfiguration="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/uml/applystereotypeadvice/1.0"
+    xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.0"
+    xmlns:stereotypeapplicationmatcherconfiguration="http://www.eclipse.org/payrus/elementtypesconfigurations/uml/stereotypematcherconfiguration"
+    xmi:id="_Qt9c4Mv4EeS5BpE3hOblyw"
+    name="SysML"
+    identifier="org.eclipse.papyrus.SysML14.elementTypes"
+    metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML">
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c4cv4EeS5BpE3hOblyw"
+      name="ValueType (3080)"
+      identifier="org.eclipse.papyrus.SysML14.ValueType_3080"
+      hint="3080">
+    <iconEntry
+        xmi:id="_Qt9c4sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ValueType</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_3080</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c48v4EeS5BpE3hOblyw" name="ValueType (2068)" identifier="org.eclipse.papyrus.SysML14.ValueType_2068" hint="2068">
-    <iconEntry xmi:id="_Qt9c5Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c48v4EeS5BpE3hOblyw"
+      name="ValueType (2068)"
+      identifier="org.eclipse.papyrus.SysML14.ValueType_2068"
+      hint="2068">
+    <iconEntry
+        xmi:id="_Qt9c5Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/DataType.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ValueType</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_2068</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c5cv4EeS5BpE3hOblyw" name="DistributedProperty (3070)" identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9c5sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c5cv4EeS5BpE3hOblyw"
+      name="DistributedProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9c5sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.DistributedProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c58v4EeS5BpE3hOblyw" name="DistributedProperty (3101)" identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9c6Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c58v4EeS5BpE3hOblyw"
+      name="DistributedProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.DistributedProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9c6Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.DistributedProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c6cv4EeS5BpE3hOblyw" name="ConnectorProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9c6sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c6cv4EeS5BpE3hOblyw"
+      name="ConnectorProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9c6sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ConnectorProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c68v4EeS5BpE3hOblyw" name="ConnectorProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9c7Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c68v4EeS5BpE3hOblyw"
+      name="ConnectorProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.ConnectorProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9c7Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ConnectorProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c7cv4EeS5BpE3hOblyw" name="ParticipantProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9c7sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c7cv4EeS5BpE3hOblyw"
+      name="ParticipantProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9c7sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ParticipantProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c78v4EeS5BpE3hOblyw" name="ParticipantProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9c8Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c78v4EeS5BpE3hOblyw"
+      name="ParticipantProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.ParticipantProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9c8Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ParticipantProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c8cv4EeS5BpE3hOblyw" name="BindingConnector" identifier="org.eclipse.papyrus.SysML14.BindingConnector_4013" hint="4013">
-    <iconEntry xmi:id="_Qt9c8sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Connector.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c8cv4EeS5BpE3hOblyw"
+      name="BindingConnector"
+      identifier="org.eclipse.papyrus.SysML14.BindingConnector_4013"
+      hint="4013">
+    <iconEntry
+        xmi:id="_Qt9c8sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Connector.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.BindingConnector</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Connector_4013</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c88v4EeS5BpE3hOblyw" name="Block (3085)" identifier="org.eclipse.papyrus.SysML14.Block_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9c9Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c88v4EeS5BpE3hOblyw"
+      name="Block (3085)"
+      identifier="org.eclipse.papyrus.SysML14.Block_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9c9Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Block</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c9cv4EeS5BpE3hOblyw" name="Block (2073)" identifier="org.eclipse.papyrus.SysML14.Block_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9c9sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c9cv4EeS5BpE3hOblyw"
+      name="Block (2073)"
+      identifier="org.eclipse.papyrus.SysML14.Block_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9c9sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Block</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c98v4EeS5BpE3hOblyw" name="EndPathMultiplicity (3070)" identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9c-Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c98v4EeS5BpE3hOblyw"
+      name="EndPathMultiplicity (3070)"
+      identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9c-Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.EndPathMultiplicity</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c-cv4EeS5BpE3hOblyw" name="EndPathMultiplicity (3101)" identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9c-sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c-cv4EeS5BpE3hOblyw"
+      name="EndPathMultiplicity (3101)"
+      identifier="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9c-sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.EndPathMultiplicity</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c-8v4EeS5BpE3hOblyw" name="BoundReference (3070)" identifier="org.eclipse.papyrus.SysML14.BoundReference_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9c_Mv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c-8v4EeS5BpE3hOblyw"
+      name="BoundReference (3070)"
+      identifier="org.eclipse.papyrus.SysML14.BoundReference_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9c_Mv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.BoundReference</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c_cv4EeS5BpE3hOblyw" name="BoundReference (3101)" identifier="org.eclipse.papyrus.SysML14.BoundReference_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9c_sv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c_cv4EeS5BpE3hOblyw"
+      name="BoundReference (3101)"
+      identifier="org.eclipse.papyrus.SysML14.BoundReference_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9c_sv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.BoundReference</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9c_8v4EeS5BpE3hOblyw" name="AdjunctProperty (3070)" identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9dAMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9c_8v4EeS5BpE3hOblyw"
+      name="AdjunctProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9dAMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.AdjunctProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dAcv4EeS5BpE3hOblyw" name="AdjunctProperty (3101)" identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9dAsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dAcv4EeS5BpE3hOblyw"
+      name="AdjunctProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.AdjunctProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9dAsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.AdjunctProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dA8v4EeS5BpE3hOblyw" name="ClassifierBehaviorProperty (3070)" identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9dBMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dA8v4EeS5BpE3hOblyw"
+      name="ClassifierBehaviorProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9dBMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dBcv4EeS5BpE3hOblyw" name="ClassifierBehaviorProperty (3101)" identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9dBsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dBcv4EeS5BpE3hOblyw"
+      name="ClassifierBehaviorProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9dBsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dB8v4EeS5BpE3hOblyw" name="ItemFlow" identifier="org.eclipse.papyrus.SysML14.ItemFlow_4021" hint="4021">
-    <iconEntry xmi:id="_Qt9dCMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/InformationFlow.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dB8v4EeS5BpE3hOblyw"
+      name="ItemFlow"
+      identifier="org.eclipse.papyrus.SysML14.ItemFlow_4021"
+      hint="4021">
+    <iconEntry
+        xmi:id="_Qt9dCMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/InformationFlow.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ItemFlow</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.InformationFlow_4021</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dCcv4EeS5BpE3hOblyw" name="FlowProperty (3070)" identifier="org.eclipse.papyrus.SysML14.FlowProperty_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9dCsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dCcv4EeS5BpE3hOblyw"
+      name="FlowProperty (3070)"
+      identifier="org.eclipse.papyrus.SysML14.FlowProperty_3070"
+      hint="3070">
+    <iconEntry
+        xmi:id="_Qt9dCsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FlowProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dC8v4EeS5BpE3hOblyw" name="FlowProperty (3101)" identifier="org.eclipse.papyrus.SysML14.FlowProperty_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9dDMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dC8v4EeS5BpE3hOblyw"
+      name="FlowProperty (3101)"
+      identifier="org.eclipse.papyrus.SysML14.FlowProperty_3101"
+      hint="3101">
+    <iconEntry
+        xmi:id="_Qt9dDMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Property.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FlowProperty</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dDcv4EeS5BpE3hOblyw" name="FullPort" identifier="org.eclipse.papyrus.SysML14.FullPort_3069" hint="3069">
-    <iconEntry xmi:id="_Qt9dDsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dDcv4EeS5BpE3hOblyw"
+      name="FullPort"
+      identifier="org.eclipse.papyrus.SysML14.FullPort_3069"
+      hint="3069">
+    <iconEntry
+        xmi:id="_Qt9dDsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Port.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FullPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dD8v4EeS5BpE3hOblyw" name="InterfaceBlock (3085)" identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dEMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dD8v4EeS5BpE3hOblyw"
+      name="InterfaceBlock (3085)"
+      identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9dEMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.InterfaceBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dEcv4EeS5BpE3hOblyw" name="InterfaceBlock (2073)" identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dEsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dEcv4EeS5BpE3hOblyw"
+      name="InterfaceBlock (2073)"
+      identifier="org.eclipse.papyrus.SysML14.InterfaceBlock_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9dEsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.InterfaceBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dE8v4EeS5BpE3hOblyw" name="ProxyPort" identifier="org.eclipse.papyrus.SysML14.ProxyPort_3069" hint="3069">
-    <iconEntry xmi:id="_Qt9dFMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dE8v4EeS5BpE3hOblyw"
+      name="ProxyPort"
+      identifier="org.eclipse.papyrus.SysML14.ProxyPort_3069"
+      hint="3069">
+    <iconEntry
+        xmi:id="_Qt9dFMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Port.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ProxyPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dFcv4EeS5BpE3hOblyw" name="ChangeStructuralFeatureEvent" identifier="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088" hint="2088">
-    <iconEntry xmi:id="_Qt9dFsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/ChangeEvent.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dFcv4EeS5BpE3hOblyw"
+      name="ChangeStructuralFeatureEvent"
+      identifier="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"
+      hint="2088">
+    <iconEntry
+        xmi:id="_Qt9dFsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/ChangeEvent.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.ChangeEvent_2088</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dF8v4EeS5BpE3hOblyw" name="ControlOperator Operation" identifier="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102" hint="3102">
-    <iconEntry xmi:id="_Qt9dGMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dF8v4EeS5BpE3hOblyw"
+      name="ControlOperator Operation"
+      identifier="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"
+      hint="3102">
+    <iconEntry
+        xmi:id="_Qt9dGMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ControlOperator_Operation</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Operation_3102</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dGcv4EeS5BpE3hOblyw" name="Rate Parameter" identifier="org.eclipse.papyrus.SysML14.Rate_Parameter_3088" hint="3088">
-    <iconEntry xmi:id="_Qt9dGsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dGcv4EeS5BpE3hOblyw"
+      name="Rate Parameter"
+      identifier="org.eclipse.papyrus.SysML14.Rate_Parameter_3088"
+      hint="3088">
+    <iconEntry
+        xmi:id="_Qt9dGsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Parameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Rate_Parameter</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dG8v4EeS5BpE3hOblyw" name="Discrete Parameter" identifier="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088" hint="3088">
-    <iconEntry xmi:id="_Qt9dHMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dG8v4EeS5BpE3hOblyw"
+      name="Discrete Parameter"
+      identifier="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"
+      hint="3088">
+    <iconEntry
+        xmi:id="_Qt9dHMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Parameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Discrete_Parameter</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dHcv4EeS5BpE3hOblyw" name="Continuous Parameter" identifier="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088" hint="3088">
-    <iconEntry xmi:id="_Qt9dHsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dHcv4EeS5BpE3hOblyw"
+      name="Continuous Parameter"
+      identifier="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"
+      hint="3088">
+    <iconEntry
+        xmi:id="_Qt9dHsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Parameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Continuous_Parameter</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dH8v4EeS5BpE3hOblyw" name="Optional" identifier="org.eclipse.papyrus.SysML14.Optional_3088" hint="3088">
-    <iconEntry xmi:id="_Qt9dIMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Parameter.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dH8v4EeS5BpE3hOblyw"
+      name="Optional"
+      identifier="org.eclipse.papyrus.SysML14.Optional_3088"
+      hint="3088">
+    <iconEntry
+        xmi:id="_Qt9dIMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Parameter.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Optional</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Parameter_3088</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dIcv4EeS5BpE3hOblyw" name="Rationale (3097)" identifier="org.eclipse.papyrus.SysML14.Rationale_3097" hint="3097">
-    <iconEntry xmi:id="_Qt9dIsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dIcv4EeS5BpE3hOblyw"
+      name="Rationale (3097)"
+      identifier="org.eclipse.papyrus.SysML14.Rationale_3097"
+      hint="3097">
+    <iconEntry
+        xmi:id="_Qt9dIsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Rationale</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dI8v4EeS5BpE3hOblyw" name="Rationale (2109)" identifier="org.eclipse.papyrus.SysML14.Rationale_2109" hint="2109">
-    <iconEntry xmi:id="_Qt9dJMv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dI8v4EeS5BpE3hOblyw"
+      name="Rationale (2109)"
+      identifier="org.eclipse.papyrus.SysML14.Rationale_2109"
+      hint="2109">
+    <iconEntry
+        xmi:id="_Qt9dJMv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Rationale</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dJcv4EeS5BpE3hOblyw" name="View Package" identifier="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure" hint="CompositeStructure">
-    <iconEntry xmi:id="_Qt9dJsv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Package.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dJcv4EeS5BpE3hOblyw"
+      name="View Package"
+      identifier="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"
+      hint="CompositeStructure">
+    <iconEntry
+        xmi:id="_Qt9dJsv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Package.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Package_1000</specializedTypesID>
-    <matcherConfiguration xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration" xmi:id="_Qt9dJ8v4EeS5BpE3hOblyw">
+    <matcherConfiguration
+        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
+        xmi:id="_Qt9dJ8v4EeS5BpE3hOblyw">
       <stereotypesQualifiedNames>SysML::ModelElements::View</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dKMv4EeS5BpE3hOblyw" name="View (3085)" identifier="org.eclipse.papyrus.SysML14.View_Class_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dKcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dKMv4EeS5BpE3hOblyw"
+      name="View (3085)"
+      identifier="org.eclipse.papyrus.SysML14.View_Class_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9dKcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.View_Class</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dKsv4EeS5BpE3hOblyw" name="View (2073)" identifier="org.eclipse.papyrus.SysML14.View_Class_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dK8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dKsv4EeS5BpE3hOblyw"
+      name="View (2073)"
+      identifier="org.eclipse.papyrus.SysML14.View_Class_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9dK8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.View_Class</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dLMv4EeS5BpE3hOblyw" name="Conform Dependency" identifier="org.eclipse.papyrus.SysML14.Conform_Dependency_4010" hint="4010">
-    <iconEntry xmi:id="_Qt9dLcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dLMv4EeS5BpE3hOblyw"
+      name="Conform Dependency"
+      identifier="org.eclipse.papyrus.SysML14.Conform_Dependency_4010"
+      hint="4010">
+    <iconEntry
+        xmi:id="_Qt9dLcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Conform_Dependency</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Dependency_4010</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dLsv4EeS5BpE3hOblyw" name="Conform Generalization" identifier="org.eclipse.papyrus.SysML14.Conform_Generalization_4015" hint="4015">
-    <iconEntry xmi:id="_Qt9dL8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dLsv4EeS5BpE3hOblyw"
+      name="Conform Generalization"
+      identifier="org.eclipse.papyrus.SysML14.Conform_Generalization_4015"
+      hint="4015">
+    <iconEntry
+        xmi:id="_Qt9dL8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Generalization.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Conform_Generalization</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Generalization_4015</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dMMv4EeS5BpE3hOblyw" name="Problem (3097)" identifier="org.eclipse.papyrus.SysML14.Problem_3097" hint="3097">
-    <iconEntry xmi:id="_Qt9dMcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dMMv4EeS5BpE3hOblyw"
+      name="Problem (3097)"
+      identifier="org.eclipse.papyrus.SysML14.Problem_3097"
+      hint="3097">
+    <iconEntry
+        xmi:id="_Qt9dMcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Problem</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dMsv4EeS5BpE3hOblyw" name="Problem (2109)" identifier="org.eclipse.papyrus.SysML14.Problem_2109" hint="2109">
-    <iconEntry xmi:id="_Qt9dM8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dMsv4EeS5BpE3hOblyw"
+      name="Problem (2109)"
+      identifier="org.eclipse.papyrus.SysML14.Problem_2109"
+      hint="2109">
+    <iconEntry
+        xmi:id="_Qt9dM8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Problem</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dNMv4EeS5BpE3hOblyw" name="ViewPoint (3085)" identifier="org.eclipse.papyrus.SysML14.ViewPoint_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dNcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dNMv4EeS5BpE3hOblyw"
+      name="ViewPoint (3085)"
+      identifier="org.eclipse.papyrus.SysML14.ViewPoint_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9dNcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ViewPoint</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dNsv4EeS5BpE3hOblyw" name="ViewPoint (2073)" identifier="org.eclipse.papyrus.SysML14.ViewPoint_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dN8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dNsv4EeS5BpE3hOblyw"
+      name="ViewPoint (2073)"
+      identifier="org.eclipse.papyrus.SysML14.ViewPoint_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9dN8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ViewPoint</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dOMv4EeS5BpE3hOblyw" name="Expose" identifier="org.eclipse.papyrus.SysML14.Expose_4010" hint="4010">
-    <iconEntry xmi:id="_Qt9dOcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Dependency.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dOMv4EeS5BpE3hOblyw"
+      name="Expose"
+      identifier="org.eclipse.papyrus.SysML14.Expose_4010"
+      hint="4010">
+    <iconEntry
+        xmi:id="_Qt9dOcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Dependency.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Expose</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Dependency_4010</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dOsv4EeS5BpE3hOblyw" name="ElementGroup (3097)" identifier="org.eclipse.papyrus.SysML14.ElementGroup_3097" hint="3097">
-    <iconEntry xmi:id="_Qt9dO8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dOsv4EeS5BpE3hOblyw"
+      name="ElementGroup (3097)"
+      identifier="org.eclipse.papyrus.SysML14.ElementGroup_3097"
+      hint="3097">
+    <iconEntry
+        xmi:id="_Qt9dO8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ElementGroup</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_3097</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dPMv4EeS5BpE3hOblyw" name="ElementGroup (2109)" identifier="org.eclipse.papyrus.SysML14.ElementGroup_2109" hint="2109">
-    <iconEntry xmi:id="_Qt9dPcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Comment.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dPMv4EeS5BpE3hOblyw"
+      name="ElementGroup (2109)"
+      identifier="org.eclipse.papyrus.SysML14.ElementGroup_2109"
+      hint="2109">
+    <iconEntry
+        xmi:id="_Qt9dPcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Comment.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ElementGroup</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Comment_2109</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dPsv4EeS5BpE3hOblyw" name="ConstraintBlock (3085)" identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dP8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dPsv4EeS5BpE3hOblyw"
+      name="ConstraintBlock (3085)"
+      identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9dP8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ConstraintBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dQMv4EeS5BpE3hOblyw" name="ConstraintBlock (2073)" identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dQcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dQMv4EeS5BpE3hOblyw"
+      name="ConstraintBlock (2073)"
+      identifier="org.eclipse.papyrus.SysML14.ConstraintBlock_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9dQcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.ConstraintBlock</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dQsv4EeS5BpE3hOblyw" name="Allocate Abstraction" identifier="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dQ8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dQsv4EeS5BpE3hOblyw"
+      name="Allocate Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dQ8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Allocate_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dRMv4EeS5BpE3hOblyw" name="DeriveReqt Abstraction" identifier="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dRcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dRMv4EeS5BpE3hOblyw"
+      name="DeriveReqt Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dRcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dRsv4EeS5BpE3hOblyw" name="Copy Abstraction" identifier="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dR8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dRsv4EeS5BpE3hOblyw"
+      name="Copy Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dR8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Copy_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dSMv4EeS5BpE3hOblyw" name="Satisfy Abstraction" identifier="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dScv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dSMv4EeS5BpE3hOblyw"
+      name="Satisfy Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dScv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Satisfy_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dSsv4EeS5BpE3hOblyw" name="TestCase Operation" identifier="org.eclipse.papyrus.SysML14.TestCase_Operation_3102" hint="3102">
-    <iconEntry xmi:id="_Qt9dS8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Operation.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dSsv4EeS5BpE3hOblyw"
+      name="TestCase Operation"
+      identifier="org.eclipse.papyrus.SysML14.TestCase_Operation_3102"
+      hint="3102">
+    <iconEntry
+        xmi:id="_Qt9dS8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Operation.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.TestCase_Operation</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Operation_3102</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dTMv4EeS5BpE3hOblyw" name="Requirement (3085)" identifier="org.eclipse.papyrus.SysML14.Requirement_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dTcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dTMv4EeS5BpE3hOblyw"
+      name="Requirement (3085)"
+      identifier="org.eclipse.papyrus.SysML14.Requirement_3085"
+      hint="3085">
+    <iconEntry
+        xmi:id="_Qt9dTcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Requirement</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dTsv4EeS5BpE3hOblyw" name="Requirement (2073)" identifier="org.eclipse.papyrus.SysML14.Requirement_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dT8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dTsv4EeS5BpE3hOblyw"
+      name="Requirement (2073)"
+      identifier="org.eclipse.papyrus.SysML14.Requirement_2073"
+      hint="2073">
+    <iconEntry
+        xmi:id="_Qt9dT8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Class.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Requirement</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dUMv4EeS5BpE3hOblyw" name="Verify Abstraction" identifier="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dUcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dUMv4EeS5BpE3hOblyw"
+      name="Verify Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dUcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Verify_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dUsv4EeS5BpE3hOblyw" name="Trace Abstraction" identifier="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dU8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dUsv4EeS5BpE3hOblyw"
+      name="Trace Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dU8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Trace_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dVMv4EeS5BpE3hOblyw" name="Refine Abstraction" identifier="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007" hint="4007">
-    <iconEntry xmi:id="_Qt9dVcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Abstraction.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dVMv4EeS5BpE3hOblyw"
+      name="Refine Abstraction"
+      identifier="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"
+      hint="4007">
+    <iconEntry
+        xmi:id="_Qt9dVcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Abstraction.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.Refine_Abstraction</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Abstraction_4007</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dVsv4EeS5BpE3hOblyw" name="FlowPort" identifier="org.eclipse.papyrus.SysML14.FlowPort_3069" hint="3069">
-    <iconEntry xmi:id="_Qt9dV8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Port.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dVsv4EeS5BpE3hOblyw"
+      name="FlowPort"
+      identifier="org.eclipse.papyrus.SysML14.FlowPort_3069"
+      hint="3069">
+    <iconEntry
+        xmi:id="_Qt9dV8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Port.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FlowPort</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Port_3069</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dWMv4EeS5BpE3hOblyw" name="FlowSpecification (3087)" identifier="org.eclipse.papyrus.SysML14.FlowSpecification_3087" hint="3087">
-    <iconEntry xmi:id="_Qt9dWcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dWMv4EeS5BpE3hOblyw"
+      name="FlowSpecification (3087)"
+      identifier="org.eclipse.papyrus.SysML14.FlowSpecification_3087"
+      hint="3087">
+    <iconEntry
+        xmi:id="_Qt9dWcv4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FlowSpecification</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Interface_3087</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dWsv4EeS5BpE3hOblyw" name="FlowSpecification (2076)" identifier="org.eclipse.papyrus.SysML14.FlowSpecification_2076" hint="2076">
-    <iconEntry xmi:id="_Qt9dW8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Interface.gif" bundleId="org.eclipse.uml2.uml.edit"/>
+  <elementTypeConfigurations
+      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
+      xmi:id="_Qt9dWsv4EeS5BpE3hOblyw"
+      name="FlowSpecification (2076)"
+      identifier="org.eclipse.papyrus.SysML14.FlowSpecification_2076"
+      hint="2076">
+    <iconEntry
+        xmi:id="_Qt9dW8v4EeS5BpE3hOblyw"
+        iconPath="/icons/full/obj16/Interface.gif"
+        bundleId="org.eclipse.uml2.uml.edit"/>
     <specializedTypesID>org.eclipse.papyrus.SysML14.FlowSpecification</specializedTypesID>
     <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Interface_2076</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dXMv4EeS5BpE3hOblyw" name="Deprecated (3070)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Property_3070" hint="3070">
-    <iconEntry xmi:id="_Qt9dXcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3070</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dXsv4EeS5BpE3hOblyw" name="Deprecated (3101)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Property_3101" hint="3101">
-    <iconEntry xmi:id="_Qt9dX8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Property_3101</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dYMv4EeS5BpE3hOblyw" name="Deprecated (3085)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Class_3085" hint="3085">
-    <iconEntry xmi:id="_Qt9dYcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_3085</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dYsv4EeS5BpE3hOblyw" name="Deprecated (2073)" identifier="org.eclipse.papyrus.SysML14.Deprecated_Class_2073" hint="2073">
-    <iconEntry xmi:id="_Qt9dY8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Class_2073</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dZMv4EeS5BpE3hOblyw" name="Deprecated Generalization" identifier="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015" hint="4015">
-    <iconEntry xmi:id="_Qt9dZcv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/Generalization.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Generalization</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.Generalization_4015</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9dZsv4EeS5BpE3hOblyw" name="Deprecated (3080)" identifier="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080" hint="3080">
-    <iconEntry xmi:id="_Qt9dZ8v4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_3080</specializedTypesID>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Qt9daMv4EeS5BpE3hOblyw" name="Deprecated (2068)" identifier="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068" hint="2068">
-    <iconEntry xmi:id="_Qt9dacv4EeS5BpE3hOblyw" iconPath="/icons/full/obj16/DataType.gif" bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.composite.DataType_2068</specializedTypesID>
-  </elementTypeConfigurations>
-  <adviceBindingsConfigurations xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration" xmi:id="_Qt9dasv4EeS5BpE3hOblyw" name="Apply View" identifier="org.eclipse.papyrus.SysML14.view_CompositeStructure" target="_Qt9dJcv4EeS5BpE3hOblyw">
-    <stereotypesToApply xmi:id="_Qt9da8v4EeS5BpE3hOblyw" stereotypeQualifiedName="SysML::ModelElements::View" updateName="true">
+  <adviceBindingsConfigurations
+      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
+      xmi:id="_Qt9dasv4EeS5BpE3hOblyw"
+      name="Apply View"
+      identifier="org.eclipse.papyrus.SysML14.view_CompositeStructure"
+      target="_Qt9dJcv4EeS5BpE3hOblyw">
+    <stereotypesToApply
+        xmi:id="_Qt9da8v4EeS5BpE3hOblyw"
+        stereotypeQualifiedName="SysML::ModelElements::View"
+        updateName="true">
       <requiredProfiles>SysML</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations
index c49d0848832..05a280bcdf7 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14UMLClassDiagram.elementtypesconfigurations
@@ -2260,420 +2260,6 @@
   </elementTypeConfigurations>
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYdcJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3002)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3002"
-      hint="3002">
-    <iconEntry
-        xmi:id="_LoKYdsJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3002</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYd8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYeMJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3005)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3005"
-      hint="3005">
-    <iconEntry
-        xmi:id="_LoKYecJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3005</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYesJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYe8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (3006)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3006"
-      hint="3006">
-    <iconEntry
-        xmi:id="_LoKYfMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3006</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYfcJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYfsJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3012)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3012"
-      hint="3012">
-    <iconEntry
-        xmi:id="_LoKYf8JQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3012</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYgMJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYgcJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3018)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3018"
-      hint="3018">
-    <iconEntry
-        xmi:id="_LoKYgsJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3018</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYg8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYhMJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3041)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Property_3041"
-      hint="3041">
-    <iconEntry
-        xmi:id="_LoKYhcJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Property</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Property_3041</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYhsJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYh8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (4021)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"
-      hint="4021">
-    <iconEntry
-        xmi:id="_LoKYiMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/InstanceSpecification.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecificationLink_4021</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYicJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYisJQEeSX9MoKMBV5Gw"
-      name="Deprecated (2001)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"
-      hint="2001">
-    <iconEntry
-        xmi:id="_LoKYi8JQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/InstanceSpecification.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_2001</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYjMJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYjcJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3020)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"
-      hint="3020">
-    <iconEntry
-        xmi:id="_LoKYjsJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/InstanceSpecification.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.InstanceSpecification_3020</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYj8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYkMJQEeSX9MoKMBV5Gw"
-      name="Deprecated (2008)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Class_2008"
-      hint="2008">
-    <iconEntry
-        xmi:id="_LoKYkcJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_2008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYksJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYk8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (3004)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Class_3004"
-      hint="3004">
-    <iconEntry
-        xmi:id="_LoKYlMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3004</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYlcJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYlsJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3008)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Class_3008"
-      hint="3008">
-    <iconEntry
-        xmi:id="_LoKYl8JQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3008</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYmMJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYmcJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3010)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Class_3010"
-      hint="3010">
-    <iconEntry
-        xmi:id="_LoKYmsJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3010</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYm8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYnMJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3014)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Class_3014"
-      hint="3014">
-    <iconEntry
-        xmi:id="_LoKYncJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Class</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Class_3014</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYnsJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYn8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (2015)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Association_2015"
-      hint="2015">
-    <iconEntry
-        xmi:id="_LoKYoMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Association.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Association</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Association_2015</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYocJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYosJQEeSX9MoKMBV5Gw"
-      name="Deprecated (4001)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Association_4001"
-      hint="4001">
-    <iconEntry
-        xmi:id="_LoKYo8JQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Association.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Association</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Association_4001</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYpMJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYpcJQEeSX9MoKMBV5Gw"
-      name="Deprecated (4019)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Association_4019"
-      hint="4019">
-    <iconEntry
-        xmi:id="_LoKYpsJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Association.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Association</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Association_4019</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYp8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYqMJQEeSX9MoKMBV5Gw"
-      name="Deprecated Generalization"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"
-      hint="4002">
-    <iconEntry
-        xmi:id="_LoKYqcJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/Generalization.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_Generalization</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.Generalization_4002</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYqsJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYq8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (2010)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"
-      hint="2010">
-    <iconEntry
-        xmi:id="_LoKYrMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.DataType_2010</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYrcJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYrsJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3027)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"
-      hint="3027">
-    <iconEntry
-        xmi:id="_LoKYr8JQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.DataType_3027</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYsMJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYscJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3043)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"
-      hint="3043">
-    <iconEntry
-        xmi:id="_LoKYssJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.DataType_3043</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYs8JQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYtMJQEeSX9MoKMBV5Gw"
-      name="Deprecated (3044)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"
-      hint="3044">
-    <iconEntry
-        xmi:id="_LoKYtcJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.DataType_3044</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYtsJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_LoKYt8JQEeSX9MoKMBV5Gw"
-      name="Deprecated (3045)"
-      identifier="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"
-      hint="3045">
-    <iconEntry
-        xmi:id="_LoKYuMJQEeSX9MoKMBV5Gw"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.SysML14.Deprecated_DataType</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.clazz.DataType_3045</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_LoKYucJQEeSX9MoKMBV5Gw">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_tjVDYM1xEeSsRbN4ihgqDg"
       name="FlowPort (FlowPort_Label)"
       description=""
@@ -2854,7 +2440,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_7fjysOgVEeSUQvXhEVQh8w"
-      name="Unit"
+      name="Unit_2001"
       description="Create an Unit in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.Unit_2001"
       hint="2001">
@@ -2864,7 +2450,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_v7PJAOgXEeSUQvXhEVQh8w"
-      name="Unit"
+      name="Unit_3020"
       description="Create an Unit in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.Unit_3020"
       hint="3020">
@@ -2874,7 +2460,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_zWOO4OgnEeSUQvXhEVQh8w"
-      name="Unit"
+      name="QuantityKind_2001"
       description="Create an QuantityKind in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.QuantityKind_2001"
       hint="2001">
@@ -2884,7 +2470,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_zWOO4egnEeSUQvXhEVQh8w"
-      name="Unit"
+      name="QuantityKind_3020"
       description="Create an QuantityKind in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.QuantityKind_3020"
       hint="3020">
@@ -2894,7 +2480,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_X7E5oOgtEeSUQvXhEVQh8w"
-      name="PartAssociation"
+      name="PartAssociation_2015"
       description="Create an Part Association in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.PartAssociation_2015"
       hint="2015">
@@ -2904,7 +2490,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_nJF78OgtEeSUQvXhEVQh8w"
-      name="PartAssociation"
+      name="PartAssociation_4001"
       description="Create an Part Association in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.PartAssociation_4001"
       hint="4001">
@@ -2914,7 +2500,7 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_oAQ0gOgtEeSUQvXhEVQh8w"
-      name="PartAssociation"
+      name="PartAssociation_4019"
       description="Create an Part Association in a UML Class Diagram"
       identifier="org.eclipse.papyrus.sysML.PartAssociation_4019"
       hint="4019">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration
index 3a04237eb18..7d4a10a3b02 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration
@@ -65,62 +65,6 @@
     </ownedConfigurations>
   </drawerConfigurations>
   <drawerConfigurations
-      id="Deprecated"
-      label="Deprecated"
-      description="Deprecated">
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="palettemodel.Deprecated_DataType"
-        label="Deprecated_DataType"
-        description="Create a Deprecated">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/DataType.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="palettemodel.Deprecated Generalization"
-        label="Deprecated Generalization"
-        description="Create a Deprecated Generalization"
-        kind="ConnectionTool">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="palettemodel.Deprecated.property"
-        label="Deprecated_Property"
-        description="Create a Deprecated Property">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3070"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations
-        xsi:type="paletteconfiguration:ToolConfiguration"
-        id="palettemodel.Deprecated_Class"
-        label="Deprecated_Class"
-        description="Create a Deprecated_Class">
-      <icon
-          pluginID="org.eclipse.uml2.uml.edit"
-          iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_3085"/>
-      <elementDescriptors
-          elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_2073"/>
-    </ownedConfigurations>
-  </drawerConfigurations>
-  <drawerConfigurations
       id="SysML Nodes"
       label="Other Nodes"
       description="Other Nodes">
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration
index 4d079d3bc78..488e5cfa606 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.parametric/resources/palette/parametricDiagramPalette.paletteconfiguration
@@ -1,235 +1,580 @@
 <?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
-  <drawerConfigurations id="palette.sysml.parametric.nodes" label="Nodes" description="Nodes">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Comment" label="Comment" description="Create a comment">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Constraint" label="Constraint" description="Create a constraint">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Constraint.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>
+<paletteconfiguration:PaletteConfiguration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
+    id="palettemodel"
+    label="SysML">
+  <drawerConfigurations
+      id="palette.sysml.parametric.nodes"
+      label="Nodes"
+      description="Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Comment"
+        label="Comment"
+        description="Create a comment">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Comment_2109"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Comment_3097"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Constraint"
+        label="Constraint"
+        description="Create a constraint">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Constraint.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Constraint_3120"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.composite.Constraint_2114"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="palette.sysml.parametric.edges" label="Edges" description="Edges">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Dependency" label="Dependency" description="Create a dependency" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"/>
+  <drawerConfigurations
+      id="palette.sysml.parametric.edges"
+      label="Edges"
+      description="Edges">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Dependency"
+        label="Dependency"
+        description="Create a dependency"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="/icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_2014"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Dependency_4018"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_DataType" label="Deprecated_DataType" description="Create a Deprecated">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_2068"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_DataType_3080"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated Generalization" label="Deprecated Generalization" description="Create a Deprecated Generalization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated.property" label="Deprecated_Property" description="Create a Deprecated Property">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Property_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Deprecated_Class" label="Deprecated_Class" description="Create a Deprecated_Class">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Deprecated_Class_2073"/>
+  <drawerConfigurations
+      id="SysML Nodes"
+      label="Other Nodes"
+      description="Other Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ClassifierBehaviorProperty"
+        label="ClassifierBehaviorProperty"
+        description="Create a ClassifierBehaviorProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.DistributedProperty"
+        label="DistributedProperty"
+        description="Create a DistributedProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ConnectorProperty"
+        label="ConnectorProperty"
+        description="Create a ConnectorProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ParticipantProperty"
+        label="ParticipantProperty"
+        description="Create a ParticipantProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.FlowProperty"
+        label="FlowProperty"
+        description="Create a FlowProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Block"
+        label="Block"
+        description="Create a Block">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Block_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Block_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ValueType"
+        label="ValueType"
+        description="Create a ValueType">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ValueType_3080"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ValueType_2068"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ConstraintBlock"
+        label="ConstraintBlock"
+        description="Create a ConstraintBlock">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Requirement"
+        label="Requirement"
+        description="Create a Requirement">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Requirement_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Requirement_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Problem"
+        label="Problem"
+        description="Create a Problem">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Problem_3097"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Problem_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.FlowSpecification"
+        label="FlowSpecification"
+        description="Create a FlowSpecification">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_3087"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_2076"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ViewPoint"
+        label="ViewPoint"
+        description="Create a ViewPoint">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml.edit"
+          iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.TestCase Operation"
+        label="TestCase Operation"
+        description="Create a TestCase Operation">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.TestCase_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ControlOperator Operation"
+        label="ControlOperator Operation"
+        description="Create a ControlOperator Operation">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Rationale"
+        label="Rationale"
+        description="Create a Rationale">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Rationale_3097"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Rationale_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.View_Class"
+        label="View"
+        description="Create a View">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.View_Class_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.View_Class_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.View Package"
+        label="View Package"
+        description="Create a View Package">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.InterfaceBlock "
+        label="InterfaceBlock"
+        description="Create a InterfaceBlock">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_3085"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_2073"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.AdjunctProperty"
+        label="AdjunctProperty"
+        description="Create a AdjunctProperty ">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.FlowPort"
+        label="FlowPort"
+        description="Create a FlowPort">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/portandflows/FlowPort.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FlowPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.EndPathMultiplicity "
+        label="EndPathMultiplicity"
+        description="Create a EndPathMultiplicity">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Rate Parameter"
+        label="Rate Parameter"
+        description="Create a Rate Parameter">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Rate_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Discrete Parameter"
+        label="Discrete Parameter"
+        description="Create a Discrete Parameter">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Continuous Parameter"
+        label="Continuous Parameter"
+        description="Create a Continuous Parameter">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ChangeStructuralFeatureEvent"
+        label="ChangeStructuralFeatureEvent"
+        description="Create a ChangeStructuralFeatureEvent">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/ChangeEvent.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ElementGroup"
+        label="ElementGroup"
+        description="Create a ElementGroup">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_3097"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_2109"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Optional"
+        label="Optional"
+        description="Create a Optional">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Parameter.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Optional_3088"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.FullPort"
+        label="FullPort"
+        description="Create a FullPort">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.FullPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ProxyPort"
+        label="ProxyPort"
+        description="Create a ProxyPort">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Port.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ProxyPort_3069"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.BoundReference"
+        label="BoundReference"
+        description="Create a BoundReference">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3070"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3101"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="SysML Nodes" label="Other Nodes" description="Other Nodes">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DistributedProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConnectorProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ParticipantProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Block" label="Block" description="Create a Block">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Block_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ValueType" label="ValueType" description="Create a ValueType">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_3080"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ValueType_2068"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ConstraintBlock_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Requirement" label="Requirement" description="Create a Requirement">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Requirement_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Problem" label="Problem" description="Create a Problem">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_3097"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Problem_2109"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_3087"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowSpecification_2076"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
-      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ViewPoint_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.TestCase Operation" label="TestCase Operation" description="Create a TestCase Operation">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.TestCase_Operation_3102"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ControlOperator Operation" label="ControlOperator Operation" description="Create a ControlOperator Operation">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rationale" label="Rationale" description="Create a Rationale">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_3097"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rationale_2109"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View_Class" label="View" description="Create a View">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Class_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.View Package" label="View Package" description="Create a View Package">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.InterfaceBlock " label="InterfaceBlock" description="Create a InterfaceBlock">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_3085"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.InterfaceBlock_2073"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty ">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.AdjunctProperty_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FlowPort" label="FlowPort" description="Create a FlowPort">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowPort.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FlowPort_3069"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.EndPathMultiplicity " label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Rate Parameter" label="Rate Parameter" description="Create a Rate Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Rate_Parameter_3088"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Discrete Parameter" label="Discrete Parameter" description="Create a Discrete Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Continuous Parameter" label="Continuous Parameter" description="Create a Continuous Parameter">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ChangeStructuralFeatureEvent" label="ChangeStructuralFeatureEvent" description="Create a ChangeStructuralFeatureEvent">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/ChangeEvent.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_3097"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ElementGroup_2109"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Optional" label="Optional" description="Create a Optional">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Parameter.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Optional_3088"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.FullPort" label="FullPort" description="Create a FullPort">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.FullPort_3069"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ProxyPort" label="ProxyPort" description="Create a ProxyPort">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Port.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ProxyPort_3069"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BoundReference" label="BoundReference" description="Create a BoundReference">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3070"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BoundReference_3101"/>
-    </ownedConfigurations>
-  </drawerConfigurations>
-  <drawerConfigurations id="SysML Edges" label="Other Edges" description="Other Edges">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Expose_4010"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Copy Abstraction" label="Copy Abstraction" description="Create a Copy Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Verify Abstraction" label="Verify Abstraction" description="Create a Verify Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Trace Abstraction" label="Trace Abstraction" description="Create a Trace Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Dependency" label="Conform Dependency" description="Create a Conform Dependency" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Dependency_4010"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Conform Generalization" label="Conform Generalization" description="Create a Conform Generalization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Conform_Generalization_4015"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Refine Abstraction" label="Refine Abstraction" description="Create a Refine Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Allocate Abstraction" label="Allocate Abstraction" description="Create a Allocate Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.DeriveReqt Abstraction" label="DeriveReqt Abstraction" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.Satisfy Abstraction" label="Satisfy Abstraction" description="Create a Satisfy Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/ItemFlow.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.ItemFlow_4021"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.BindingConnector" label="BindingConnector" description="Create a BindingConnector">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Connector.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.SysML14.BindingConnector_4013"/>
+  <drawerConfigurations
+      id="SysML Edges"
+      label="Other Edges"
+      description="Other Edges">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Expose"
+        label="Expose"
+        description="Create a Expose"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Expose_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Copy Abstraction"
+        label="Copy Abstraction"
+        description="Create a Copy Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Verify Abstraction"
+        label="Verify Abstraction"
+        description="Create a Verify Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Trace Abstraction"
+        label="Trace Abstraction"
+        description="Create a Trace Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Conform Dependency"
+        label="Conform Dependency"
+        description="Create a Conform Dependency"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Conform_Dependency_4010"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Conform Generalization"
+        label="Conform Generalization"
+        description="Create a Conform Generalization"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Conform_Generalization_4015"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Refine Abstraction"
+        label="Refine Abstraction"
+        description="Create a Refine Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Allocate Abstraction"
+        label="Allocate Abstraction"
+        description="Create a Allocate Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.DeriveReqt Abstraction"
+        label="DeriveReqt Abstraction"
+        description="Create a DeriveReqt Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.Satisfy Abstraction"
+        label="Satisfy Abstraction"
+        description="Create a Satisfy Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.ItemFlow"
+        label="ItemFlow"
+        description="Create a ItemFlow"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/portandflows/ItemFlow.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.ItemFlow_4021"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="palettemodel.BindingConnector"
+        label="BindingConnector"
+        description="Create a BindingConnector">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Connector.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.SysML14.BindingConnector_4013"/>
     </ownedConfigurations>
   </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
index 98459667e42..e9bc06562e4 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration
@@ -1,294 +1,630 @@
 <?xml version="1.0" encoding="ASCII"?>
-<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7" id="palettemodel" label="SysML">
-  <drawerConfigurations id="palette.sysml.requirement.nodes" label="Nodes" description="Nodes">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Package" label="Package" description="Create a package">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Requirement" label="Requirement" description="Create a Requirement">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Requirement.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Requirement_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Problem" label="Problem" description="Create a Problem">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Problem.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Rationale" label="Rationale" description="Create a Rationale">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/modelelements/Rationale.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_2012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Rationale_3028"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.TestCase_Operation" label="TestCase" description="Create a TestCase">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3003"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3007"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3013"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3019"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3042"/>
+<paletteconfiguration:PaletteConfiguration
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7"
+    id="palettemodel"
+    label="SysML">
+  <drawerConfigurations
+      id="palette.sysml.requirement.nodes"
+      label="Nodes"
+      description="Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Package"
+        label="Package"
+        description="Create a package">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Package_2007"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Package_3009"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Requirement"
+        label="Requirement"
+        description="Create a Requirement">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Requirement.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Requirement_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Requirement_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Problem"
+        label="Problem"
+        description="Create a Problem">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/modelelements/Problem.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Problem_2012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Problem_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Rationale"
+        label="Rationale"
+        description="Create a Rationale">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/modelelements/Rationale.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Rationale_2012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Rationale_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.TestCase_Operation"
+        label="TestCase"
+        description="Create a TestCase">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3003"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3007"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3013"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3019"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.TestCase_Operation_3042"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="palette.sysml.requirement.edges" label="Edges" description="Edges">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Copy_Abstraction" label="Copy" description="Create a Copy" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Copy.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Copy_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction" label="DeriveReqt" description="Create a DeriveReqt Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Satisfy_Abstraction" label="Satisfy" description="Create a Satisfy" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Satisfy.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Verify_Abstraction" label="Verify" description="Create a Verify">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/requirements/Verify.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Refine_Abstraction" label="Refine" description="Create a Refine" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Refine_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Trace_Abstraction" label="Trace" description="Create a Trace" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Trace_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Link" label="Link" description="Create a Link" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="icons/obj16/Link.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>
-    </ownedConfigurations>
-  </drawerConfigurations>
-  <drawerConfigurations id="Deprecated" label="Deprecated" description="Deprecated">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Property" label="Property (Deprecated)" description="Create a Deprecated Property">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Property_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification" label="InstanceSpecification (Deprecated)" description="Create a Deprecated InstanceSpecification">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InstanceSpecification.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Class" label="Class (Deprecated)" description="Create a Deprecated Class" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Class_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Association" label="Association (Deprecated)" description="Create a Deprecated Association" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Association.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_2015"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4001"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Association_4019"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_Generalization" label="Generalization (Deprecated)" description="Create a Deprecated Generalization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Deprecated_DataType" label="DataType (Deprecated)" description="Create a Deprecated DataType">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/DataType.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_2010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3027"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3043"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3044"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Deprecated_DataType_3045"/>
+  <drawerConfigurations
+      id="palette.sysml.requirement.edges"
+      label="Edges"
+      description="Edges">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Copy_Abstraction"
+        label="Copy"
+        description="Create a Copy"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Copy.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Copy_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction"
+        label="DeriveReqt"
+        description="Create a DeriveReqt Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DeriveReqt_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Satisfy_Abstraction"
+        label="Satisfy"
+        description="Create a Satisfy"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Satisfy.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Satisfy_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Verify_Abstraction"
+        label="Verify"
+        description="Create a Verify">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/requirements/Verify.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Verify_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Refine_Abstraction"
+        label="Refine"
+        description="Create a Refine"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Refine_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Trace_Abstraction"
+        label="Trace"
+        description="Create a Trace"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Trace_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Link"
+        label="Link"
+        description="Create a Link"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.papyrus.uml.diagram.clazz"
+          iconPath="icons/obj16/Link.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.uml.diagram.clazz.Link_4016"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="Other SysML Elements" label="Other SysML Elements" description="Other SysML Elements">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDi" label="View" description="Create a View">
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDiagram"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocated" label="Allocated" description="Create a Allocated">
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocated_2097"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.RequirementRelated" label="RequirementRelated" description="Create a RequirementRelated">
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.RequirementRelated_2097"/>
+  <drawerConfigurations
+      id="Other SysML Elements"
+      label="Other SysML Elements"
+      description="Other SysML Elements">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDi"
+        label="View"
+        description="Create a View">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Package_PapyrusUMLClassDiagram"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Allocated"
+        label="Allocated"
+        description="Create a Allocated">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Allocated_2097"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.RequirementRelated"
+        label="RequirementRelated"
+        description="Create a RequirementRelated">
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.RequirementRelated_2097"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="Nodes" label="Other Nodes" description="Other Nodes">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.AdjunctProperty" label="AdjunctProperty" description="Create a AdjunctProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.BoundReference" label="BoundReference" description="Create a BoundReference">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty" label="ClassifierBehaviorProperty" description="Create a ClassifierBehaviorProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConnectorProperty" label="ConnectorProperty" description="Create a ConnectorProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ConstraintBlock" label="ConstraintBlock" description="Create a ConstraintBlock">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/constraints/ConstraintBlock.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ControlOperator_Operation" label="ControlOperator" description="Create a ControlOperator">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3003"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3007"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3013"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3019"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3042"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.DistributedProperty" label="DistributedProperty" description="Create a DistributedProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_2012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_3028"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.EndPathMultiplicity" label="EndPathMultiplicity" description="Create a EndPathMultiplicity">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowProperty" label="FlowProperty" description="Create a FlowProperty">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/portandflows/FlowProperty.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.FlowSpecification" label="FlowSpecification" description="Create a FlowSpecification">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Interface.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_2004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3023"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3036"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3037"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3038"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.InterfaceBlock" label="InterfaceBlock" description="Create a InterfaceBlock">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ParticipantProperty" label="ParticipantProperty" description="Create a ParticipantProperty">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Property.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3002"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3005"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3006"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3012"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3018"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3041"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Package" label="View" description="Create a View">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Package.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_2007"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Package_3009"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ViewPoint" label="ViewPoint" description="Create a ViewPoint">
-      <icon pluginID="org.eclipse.papyrus.sysml.edit" iconPath="icons/full/obj16/ViewPoint.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.View_Class" label="View Class" description="Create a View Class">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Class.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.View_Class_3014"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ValueType" label="ValueType" description="Create a ValueType">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/ValueType.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_2010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3027"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3043"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3044"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ValueType_3045"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Block" label="Block" description="Create a Block">
-      <icon pluginID="org.eclipse.papyrus.sysml" iconPath="icons/blocks/Block.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_2008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3004"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3010"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Block_3014"/>
+  <drawerConfigurations
+      id="Nodes"
+      label="Other Nodes"
+      description="Other Nodes">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.AdjunctProperty"
+        label="AdjunctProperty"
+        description="Create a AdjunctProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.AdjunctProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.BoundReference"
+        label="BoundReference"
+        description="Create a BoundReference">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.BoundReference_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty"
+        label="ClassifierBehaviorProperty"
+        description="Create a ClassifierBehaviorProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ClassifierBehaviorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ConnectorProperty"
+        label="ConnectorProperty"
+        description="Create a ConnectorProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConnectorProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ConstraintBlock"
+        label="ConstraintBlock"
+        description="Create a ConstraintBlock">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/constraints/ConstraintBlock.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ConstraintBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ControlOperator_Operation"
+        label="ControlOperator"
+        description="Create a ControlOperator">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Operation.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3003"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3007"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3013"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3019"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ControlOperator_Operation_3042"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.DistributedProperty"
+        label="DistributedProperty"
+        description="Create a DistributedProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.DistributedProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ElementGroup"
+        label="ElementGroup"
+        description="Create a ElementGroup">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Comment.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_2012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ElementGroup_3028"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.EndPathMultiplicity"
+        label="EndPathMultiplicity"
+        description="Create a EndPathMultiplicity">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.EndPathMultiplicity_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.FlowProperty"
+        label="FlowProperty"
+        description="Create a FlowProperty">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/portandflows/FlowProperty.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.FlowSpecification"
+        label="FlowSpecification"
+        description="Create a FlowSpecification">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Interface.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_2004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3023"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3036"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3037"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.FlowSpecification_3038"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.InterfaceBlock"
+        label="InterfaceBlock"
+        description="Create a InterfaceBlock">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.InterfaceBlock_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ParticipantProperty"
+        label="ParticipantProperty"
+        description="Create a ParticipantProperty">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Property.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3002"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3005"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3006"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3012"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3018"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ParticipantProperty_3041"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.View_Package"
+        label="View"
+        description="Create a View">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Package.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Package_2007"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Package_3009"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ViewPoint"
+        label="ViewPoint"
+        description="Create a ViewPoint">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml.edit"
+          iconPath="icons/full/obj16/ViewPoint.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ViewPoint_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.View_Class"
+        label="View Class"
+        description="Create a View Class">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Class.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Class_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.View_Class_3014"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ValueType"
+        label="ValueType"
+        description="Create a ValueType">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/blocks/ValueType.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ValueType_2010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3027"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3043"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3044"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ValueType_3045"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Block"
+        label="Block"
+        description="Create a Block">
+      <icon
+          pluginID="org.eclipse.papyrus.sysml"
+          iconPath="icons/blocks/Block.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Block_2008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Block_3004"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Block_3008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Block_3010"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Block_3014"/>
     </ownedConfigurations>
   </drawerConfigurations>
-  <drawerConfigurations id="Edges" label="Other Edges" description="Other Edges">
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Generalization" label="Conform" description="Create a Conform Generalization" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Generalization.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Generalization_4002"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Allocate_Abstraction" label="Allocate" description="Create a Allocate Abstraction" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Abstraction.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Allocate_Abstraction_4006"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Conform_Dependency" label="Conform" description="Create a Conform " kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_2014"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4018"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.Expose" label="Expose" description="Create a Expose" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Dependency.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_2014"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4008"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.Expose_4018"/>
-    </ownedConfigurations>
-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.ItemFlow" label="ItemFlow" description="Create a ItemFlow" kind="ConnectionTool">
-      <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/InformationFlow.gif"/>
-      <elementDescriptors elementTypeId="org.eclipse.papyrus.sysML.ItemFlow_4026"/>
+  <drawerConfigurations
+      id="Edges"
+      label="Other Edges"
+      description="Other Edges">
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Conform_Generalization"
+        label="Conform"
+        description="Create a Conform Generalization"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Generalization.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Conform_Generalization_4002"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Allocate_Abstraction"
+        label="Allocate"
+        description="Create a Allocate Abstraction"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Abstraction.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Allocate_Abstraction_4006"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Conform_Dependency"
+        label="Conform"
+        description="Create a Conform "
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_2014"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Conform_Dependency_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.Expose"
+        label="Expose"
+        description="Create a Expose"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/Dependency.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Expose_2014"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Expose_4008"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.Expose_4018"/>
+    </ownedConfigurations>
+    <ownedConfigurations
+        xsi:type="paletteconfiguration:ToolConfiguration"
+        id="org.eclipse.papyrus.sysML.ItemFlow"
+        label="ItemFlow"
+        description="Create a ItemFlow"
+        kind="ConnectionTool">
+      <icon
+          pluginID="org.eclipse.uml2.uml.edit"
+          iconPath="icons/full/obj16/InformationFlow.gif"/>
+      <elementDescriptors
+          elementTypeId="org.eclipse.papyrus.sysML.ItemFlow_4026"/>
     </ownedConfigurations>
   </drawerConfigurations>
 </paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.elementtypesconfigurations b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.elementtypesconfigurations
index 871fc68ff07..3ddad5a2ed3 100644
--- a/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.elementtypesconfigurations
+++ b/plugins/sysml/sysml14/org.eclipse.papyrus.sysml14.service.types/model/SysML14.elementtypesconfigurations
@@ -1253,125 +1253,6 @@
   </elementTypeConfigurations>
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnXLwFEeSwNLK2W02HwA"
-      name="Deprecated ValueSpecification"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_ValueSpecification"
-      hint="UML::ValueSpecification">
-    <iconEntry
-        xmi:id="_k4SnXbwFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/ValueSpecification.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.ValueSpecification</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnXrwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnX7wFEeSwNLK2W02HwA"
-      name="Deprecated Property"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_Property"
-      hint="UML::Property">
-    <iconEntry
-        xmi:id="_k4SnYLwFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/Property.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnYbwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnYrwFEeSwNLK2W02HwA"
-      name="Deprecated InstanceSpecification"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification"
-      hint="UML::InstanceSpecification">
-    <iconEntry
-        xmi:id="_k4SnY7wFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/InstanceSpecification.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.InstanceSpecification</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnZLwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnZbwFEeSwNLK2W02HwA"
-      name="Deprecated Class"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_Class"
-      hint="UML::Class">
-    <iconEntry
-        xmi:id="_k4SnZrwFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/Class.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnZ7wFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnaLwFEeSwNLK2W02HwA"
-      name="Deprecated Association"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_Association"
-      hint="UML::Association">
-    <iconEntry
-        xmi:id="_k4SnabwFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/Association.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Association</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnarwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4Sna7wFEeSwNLK2W02HwA"
-      name="Deprecated Generalization"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_Generalization"
-      hint="UML::Generalization">
-    <iconEntry
-        xmi:id="_k4SnbLwFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/Generalization.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.Generalization</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SnbbwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
-      xmi:id="_k4SnbrwFEeSwNLK2W02HwA"
-      name="Deprecated DataType"
-      identifier="org.eclipse.papyrus.SysML14.Deprecated_DataType"
-      hint="UML::DataType">
-    <iconEntry
-        xmi:id="_k4Snb7wFEeSwNLK2W02HwA"
-        iconPath="/icons/full/obj16/DataType.gif"
-        bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.DataType</specializedTypesID>
-    <matcherConfiguration
-        xsi:type="stereotypeapplicationmatcherconfiguration:StereotypeApplicationMatcherConfiguration"
-        xmi:id="_k4SncLwFEeSwNLK2W02HwA">
-      <stereotypesQualifiedNames>SysML::DeprecatedElements::Deprecated</stereotypesQualifiedNames>
-    </matcherConfiguration>
-  </elementTypeConfigurations>
-  <elementTypeConfigurations
-      xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_5R-xwOgeEeSUQvXhEVQh8w"
       name="Unit"
       identifier="org.eclipse.papyrus.SysML14.Unit"
@@ -2365,91 +2246,37 @@
   <adviceBindingsConfigurations
       xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
       xmi:id="_k4SoA7wFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4SnXLwFEeSwNLK2W02HwA">
+      name="Apply Deprecated to Flow Port"
+      identifier="org.eclipse.papyrus.SysML14.deprecated.flowport"
+      editHelperAdviceClassName=""
+      target="_k4SnULwFEeSwNLK2W02HwA">
     <stereotypesToApply
         xmi:id="_k4SoBLwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
+        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated">
       <requiredProfiles>SysML</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
   <adviceBindingsConfigurations
       xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
       xmi:id="_k4SoBbwFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4SnX7wFEeSwNLK2W02HwA">
+      name="Apply Deprecated to Flow Specification"
+      identifier="org.eclipse.papyrus.SysML14.deprecated.flowspecification"
+      target="_k4SnU7wFEeSwNLK2W02HwA">
     <stereotypesToApply
         xmi:id="_k4SoBrwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
+        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated">
       <requiredProfiles>SysML</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
   <adviceBindingsConfigurations
       xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
       xmi:id="_k4SoB7wFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4SnYrwFEeSwNLK2W02HwA">
+      name="Apply Deprecated to Allocated"
+      identifier="org.eclipse.papyrus.SysML14.deprecated.allocated"
+      target="_k4SnVrwFEeSwNLK2W02HwA">
     <stereotypesToApply
         xmi:id="_k4SoCLwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
-      <requiredProfiles>SysML</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_k4SoCbwFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4SnZbwFEeSwNLK2W02HwA">
-    <stereotypesToApply
-        xmi:id="_k4SoCrwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
-      <requiredProfiles>SysML</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_k4SoC7wFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated_UML::Association"
-      target="_k4SnaLwFEeSwNLK2W02HwA">
-    <stereotypesToApply
-        xmi:id="_k4SoDLwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
-      <requiredProfiles>SysML</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_k4SoDbwFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4Sna7wFEeSwNLK2W02HwA">
-    <stereotypesToApply
-        xmi:id="_k4SoDrwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
-      <requiredProfiles>SysML</requiredProfiles>
-    </stereotypesToApply>
-  </adviceBindingsConfigurations>
-  <adviceBindingsConfigurations
-      xsi:type="applystereotypeadviceconfiguration:ApplyStereotypeAdviceConfiguration"
-      xmi:id="_k4SoD7wFEeSwNLK2W02HwA"
-      name="Apply Deprecated"
-      identifier="org.eclipse.papyrus.SysML14.deprecated"
-      target="_k4SnbrwFEeSwNLK2W02HwA">
-    <stereotypesToApply
-        xmi:id="_k4SoELwFEeSwNLK2W02HwA"
-        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated"
-        updateName="true">
+        stereotypeQualifiedName="SysML::DeprecatedElements::Deprecated">
       <requiredProfiles>SysML</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
diff --git a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14CompositeStructureDiagramElementTypesTest.java b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14CompositeStructureDiagramElementTypesTest.java
index 9aa46f82493..08b23258490 100644
--- a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14CompositeStructureDiagramElementTypesTest.java
+++ b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14CompositeStructureDiagramElementTypesTest.java
@@ -35,346 +35,309 @@ public class SysML14CompositeStructureDiagramElementTypesTest {
 		Assert.assertNotNull("The SysML 1.4 Composite Structure Diagram element type set definition is missing", elementTypeSetConfiguration);
 	}
 	
-
-    @Test
-	public void testRegistryContentForValueType_3080() {
-		Assert.assertTrue("ValueType (3080) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ValueType_3080"));
-	}
-
-    @Test
-	public void testRegistryContentForValueType_2068() {
-		Assert.assertTrue("ValueType (2068) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ValueType_2068"));
-	}
-
-    @Test
-	public void testRegistryContentForDistributedProperty_3070() {
-		Assert.assertTrue("DistributedProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DistributedProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForDistributedProperty_3101() {
-		Assert.assertTrue("DistributedProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DistributedProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForConnectorProperty_3070() {
-		Assert.assertTrue("ConnectorProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConnectorProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForConnectorProperty_3101() {
-		Assert.assertTrue("ConnectorProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConnectorProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForParticipantProperty_3070() {
-		Assert.assertTrue("ParticipantProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ParticipantProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForParticipantProperty_3101() {
-		Assert.assertTrue("ParticipantProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ParticipantProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForBindingConnector() {
-		Assert.assertTrue("BindingConnector element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BindingConnector_4013"));
-	}
-
-    @Test
-	public void testRegistryContentForBlock_3085() {
-		Assert.assertTrue("Block (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Block_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForBlock_2073() {
-		Assert.assertTrue("Block (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Block_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForEndPathMultiplicity_3070() {
-		Assert.assertTrue("EndPathMultiplicity (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForEndPathMultiplicity_3101() {
-		Assert.assertTrue("EndPathMultiplicity (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForBoundReference_3070() {
-		Assert.assertTrue("BoundReference (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BoundReference_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForBoundReference_3101() {
-		Assert.assertTrue("BoundReference (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BoundReference_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForAdjunctProperty_3070() {
-		Assert.assertTrue("AdjunctProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.AdjunctProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForAdjunctProperty_3101() {
-		Assert.assertTrue("AdjunctProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.AdjunctProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForClassifierBehaviorProperty_3070() {
-		Assert.assertTrue("ClassifierBehaviorProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForClassifierBehaviorProperty_3101() {
-		Assert.assertTrue("ClassifierBehaviorProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForItemFlow() {
-		Assert.assertTrue("ItemFlow element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ItemFlow_4021"));
-	}
-
-    @Test
-	public void testRegistryContentForFlowProperty_3070() {
-		Assert.assertTrue("FlowProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowProperty_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForFlowProperty_3101() {
-		Assert.assertTrue("FlowProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowProperty_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForFullPort() {
-		Assert.assertTrue("FullPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FullPort_3069"));
-	}
-
-    @Test
-	public void testRegistryContentForInterfaceBlock_3085() {
-		Assert.assertTrue("InterfaceBlock (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.InterfaceBlock_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForInterfaceBlock_2073() {
-		Assert.assertTrue("InterfaceBlock (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.InterfaceBlock_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForProxyPort() {
-		Assert.assertTrue("ProxyPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ProxyPort_3069"));
-	}
-
-    @Test
-	public void testRegistryContentForChangeStructuralFeatureEvent() {
-		Assert.assertTrue("ChangeStructuralFeatureEvent element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"));
-	}
-
-    @Test
-	public void testRegistryContentForControlOperator_Operation() {
-		Assert.assertTrue("ControlOperator Operation element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"));
-	}
-
-    @Test
-	public void testRegistryContentForRate_Parameter() {
-		Assert.assertTrue("Rate Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rate_Parameter_3088"));
-	}
-
-    @Test
-	public void testRegistryContentForDiscrete_Parameter() {
-		Assert.assertTrue("Discrete Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"));
-	}
-
-    @Test
-	public void testRegistryContentForContinuous_Parameter() {
-		Assert.assertTrue("Continuous Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"));
-	}
-
-    @Test
-	public void testRegistryContentForOptional() {
-		Assert.assertTrue("Optional element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Optional_3088"));
-	}
-
-    @Test
-	public void testRegistryContentForRationale_3097() {
-		Assert.assertTrue("Rationale (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rationale_3097"));
-	}
-
-    @Test
-	public void testRegistryContentForRationale_2109() {
-		Assert.assertTrue("Rationale (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rationale_2109"));
-	}
-
-    @Test
-	public void testRegistryContentForView_Package() {
-		Assert.assertTrue("View Package element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"));
-	}
-
-    @Test
-	public void testRegistryContentForView_3085() {
-		Assert.assertTrue("View (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Class_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForView_2073() {
-		Assert.assertTrue("View (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Class_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForConform_Dependency() {
-		Assert.assertTrue("Conform Dependency element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Conform_Dependency_4010"));
-	}
-
-    @Test
-	public void testRegistryContentForConform_Generalization() {
-		Assert.assertTrue("Conform Generalization element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Conform_Generalization_4015"));
-	}
-
-    @Test
-	public void testRegistryContentForProblem_3097() {
-		Assert.assertTrue("Problem (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Problem_3097"));
-	}
-
-    @Test
-	public void testRegistryContentForProblem_2109() {
-		Assert.assertTrue("Problem (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Problem_2109"));
-	}
-
-    @Test
-	public void testRegistryContentForViewPoint_3085() {
-		Assert.assertTrue("ViewPoint (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ViewPoint_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForViewPoint_2073() {
-		Assert.assertTrue("ViewPoint (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ViewPoint_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForExpose() {
-		Assert.assertTrue("Expose element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Expose_4010"));
-	}
-
-    @Test
-	public void testRegistryContentForElementGroup_3097() {
-		Assert.assertTrue("ElementGroup (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ElementGroup_3097"));
-	}
-
-    @Test
-	public void testRegistryContentForElementGroup_2109() {
-		Assert.assertTrue("ElementGroup (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ElementGroup_2109"));
-	}
-
-    @Test
-	public void testRegistryContentForConstraintBlock_3085() {
-		Assert.assertTrue("ConstraintBlock (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConstraintBlock_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForConstraintBlock_2073() {
-		Assert.assertTrue("ConstraintBlock (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConstraintBlock_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForAllocate_Abstraction() {
-		Assert.assertTrue("Allocate Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForDeriveReqt_Abstraction() {
-		Assert.assertTrue("DeriveReqt Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForCopy_Abstraction() {
-		Assert.assertTrue("Copy Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForSatisfy_Abstraction() {
-		Assert.assertTrue("Satisfy Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForTestCase_Operation() {
-		Assert.assertTrue("TestCase Operation element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.TestCase_Operation_3102"));
-	}
-
-    @Test
-	public void testRegistryContentForRequirement_3085() {
-		Assert.assertTrue("Requirement (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Requirement_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForRequirement_2073() {
-		Assert.assertTrue("Requirement (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Requirement_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForVerify_Abstraction() {
-		Assert.assertTrue("Verify Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForTrace_Abstraction() {
-		Assert.assertTrue("Trace Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForRefine_Abstraction() {
-		Assert.assertTrue("Refine Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"));
-	}
-
-    @Test
-	public void testRegistryContentForFlowPort() {
-		Assert.assertTrue("FlowPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowPort_3069"));
-	}
-
-    @Test
-	public void testRegistryContentForFlowSpecification_3087() {
-		Assert.assertTrue("FlowSpecification (3087) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowSpecification_3087"));
-	}
-
-    @Test
-	public void testRegistryContentForFlowSpecification_2076() {
-		Assert.assertTrue("FlowSpecification (2076) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowSpecification_2076"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3070() {
-		Assert.assertTrue("Deprecated (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Property_3070"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3101() {
-		Assert.assertTrue("Deprecated (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Property_3101"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3085() {
-		Assert.assertTrue("Deprecated (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Class_3085"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_2073() {
-		Assert.assertTrue("Deprecated (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Class_2073"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_Generalization() {
-		Assert.assertTrue("Deprecated Generalization element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Generalization_4015"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3080() {
-		Assert.assertTrue("Deprecated (3080) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_DataType_3080"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_2068() {
-		Assert.assertTrue("Deprecated (2068) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_DataType_2068"));
-	}
-
+	   @Test
+		public void testRegistryContentForValueType_3080() {
+			Assert.assertTrue("ValueType (3080) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ValueType_3080"));
+		}
+
+	    @Test
+		public void testRegistryContentForValueType_2068() {
+			Assert.assertTrue("ValueType (2068) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ValueType_2068"));
+		}
+
+	    @Test
+		public void testRegistryContentForDistributedProperty_3070() {
+			Assert.assertTrue("DistributedProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DistributedProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForDistributedProperty_3101() {
+			Assert.assertTrue("DistributedProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DistributedProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForConnectorProperty_3070() {
+			Assert.assertTrue("ConnectorProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConnectorProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForConnectorProperty_3101() {
+			Assert.assertTrue("ConnectorProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConnectorProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForParticipantProperty_3070() {
+			Assert.assertTrue("ParticipantProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ParticipantProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForParticipantProperty_3101() {
+			Assert.assertTrue("ParticipantProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ParticipantProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForBindingConnector() {
+			Assert.assertTrue("BindingConnector element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BindingConnector_4013"));
+		}
+
+	    @Test
+		public void testRegistryContentForBlock_3085() {
+			Assert.assertTrue("Block (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Block_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForBlock_2073() {
+			Assert.assertTrue("Block (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Block_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForEndPathMultiplicity_3070() {
+			Assert.assertTrue("EndPathMultiplicity (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.EndPathMultiplicity_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForEndPathMultiplicity_3101() {
+			Assert.assertTrue("EndPathMultiplicity (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.EndPathMultiplicity_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForBoundReference_3070() {
+			Assert.assertTrue("BoundReference (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BoundReference_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForBoundReference_3101() {
+			Assert.assertTrue("BoundReference (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.BoundReference_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForAdjunctProperty_3070() {
+			Assert.assertTrue("AdjunctProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.AdjunctProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForAdjunctProperty_3101() {
+			Assert.assertTrue("AdjunctProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.AdjunctProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForClassifierBehaviorProperty_3070() {
+			Assert.assertTrue("ClassifierBehaviorProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForClassifierBehaviorProperty_3101() {
+			Assert.assertTrue("ClassifierBehaviorProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ClassifierBehaviorProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForItemFlow() {
+			Assert.assertTrue("ItemFlow element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ItemFlow_4021"));
+		}
+
+	    @Test
+		public void testRegistryContentForFlowProperty_3070() {
+			Assert.assertTrue("FlowProperty (3070) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowProperty_3070"));
+		}
+
+	    @Test
+		public void testRegistryContentForFlowProperty_3101() {
+			Assert.assertTrue("FlowProperty (3101) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowProperty_3101"));
+		}
+
+	    @Test
+		public void testRegistryContentForFullPort() {
+			Assert.assertTrue("FullPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FullPort_3069"));
+		}
+
+	    @Test
+		public void testRegistryContentForInterfaceBlock_3085() {
+			Assert.assertTrue("InterfaceBlock (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.InterfaceBlock_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForInterfaceBlock_2073() {
+			Assert.assertTrue("InterfaceBlock (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.InterfaceBlock_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForProxyPort() {
+			Assert.assertTrue("ProxyPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ProxyPort_3069"));
+		}
+
+	    @Test
+		public void testRegistryContentForChangeStructuralFeatureEvent() {
+			Assert.assertTrue("ChangeStructuralFeatureEvent element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ChangeStructuralFeatureEvent_2088"));
+		}
+
+	    @Test
+		public void testRegistryContentForControlOperator_Operation() {
+			Assert.assertTrue("ControlOperator Operation element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ControlOperator_Operation_3102"));
+		}
+
+	    @Test
+		public void testRegistryContentForRate_Parameter() {
+			Assert.assertTrue("Rate Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rate_Parameter_3088"));
+		}
+
+	    @Test
+		public void testRegistryContentForDiscrete_Parameter() {
+			Assert.assertTrue("Discrete Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Discrete_Parameter_3088"));
+		}
+
+	    @Test
+		public void testRegistryContentForContinuous_Parameter() {
+			Assert.assertTrue("Continuous Parameter element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Continuous_Parameter_3088"));
+		}
+
+	    @Test
+		public void testRegistryContentForOptional() {
+			Assert.assertTrue("Optional element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Optional_3088"));
+		}
+
+	    @Test
+		public void testRegistryContentForRationale_3097() {
+			Assert.assertTrue("Rationale (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rationale_3097"));
+		}
+
+	    @Test
+		public void testRegistryContentForRationale_2109() {
+			Assert.assertTrue("Rationale (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Rationale_2109"));
+		}
+
+	    @Test
+		public void testRegistryContentForView_Package() {
+			Assert.assertTrue("View Package element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Package_CompositeStructure"));
+		}
+
+	    @Test
+		public void testRegistryContentForView_3085() {
+			Assert.assertTrue("View (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Class_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForView_2073() {
+			Assert.assertTrue("View (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.View_Class_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForConform_Dependency() {
+			Assert.assertTrue("Conform Dependency element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Conform_Dependency_4010"));
+		}
+
+	    @Test
+		public void testRegistryContentForConform_Generalization() {
+			Assert.assertTrue("Conform Generalization element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Conform_Generalization_4015"));
+		}
+
+	    @Test
+		public void testRegistryContentForProblem_3097() {
+			Assert.assertTrue("Problem (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Problem_3097"));
+		}
+
+	    @Test
+		public void testRegistryContentForProblem_2109() {
+			Assert.assertTrue("Problem (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Problem_2109"));
+		}
+
+	    @Test
+		public void testRegistryContentForViewPoint_3085() {
+			Assert.assertTrue("ViewPoint (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ViewPoint_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForViewPoint_2073() {
+			Assert.assertTrue("ViewPoint (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ViewPoint_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForExpose() {
+			Assert.assertTrue("Expose element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Expose_4010"));
+		}
+
+	    @Test
+		public void testRegistryContentForElementGroup_3097() {
+			Assert.assertTrue("ElementGroup (3097) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ElementGroup_3097"));
+		}
+
+	    @Test
+		public void testRegistryContentForElementGroup_2109() {
+			Assert.assertTrue("ElementGroup (2109) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ElementGroup_2109"));
+		}
+
+	    @Test
+		public void testRegistryContentForConstraintBlock_3085() {
+			Assert.assertTrue("ConstraintBlock (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConstraintBlock_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForConstraintBlock_2073() {
+			Assert.assertTrue("ConstraintBlock (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ConstraintBlock_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForAllocate_Abstraction() {
+			Assert.assertTrue("Allocate Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Allocate_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForDeriveReqt_Abstraction() {
+			Assert.assertTrue("DeriveReqt Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.DeriveReqt_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForCopy_Abstraction() {
+			Assert.assertTrue("Copy Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Copy_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForSatisfy_Abstraction() {
+			Assert.assertTrue("Satisfy Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Satisfy_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForTestCase_Operation() {
+			Assert.assertTrue("TestCase Operation element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.TestCase_Operation_3102"));
+		}
+
+	    @Test
+		public void testRegistryContentForRequirement_3085() {
+			Assert.assertTrue("Requirement (3085) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Requirement_3085"));
+		}
+
+	    @Test
+		public void testRegistryContentForRequirement_2073() {
+			Assert.assertTrue("Requirement (2073) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Requirement_2073"));
+		}
+
+	    @Test
+		public void testRegistryContentForVerify_Abstraction() {
+			Assert.assertTrue("Verify Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Verify_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForTrace_Abstraction() {
+			Assert.assertTrue("Trace Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Trace_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForRefine_Abstraction() {
+			Assert.assertTrue("Refine Abstraction element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Refine_Abstraction_4007"));
+		}
+
+	    @Test
+		public void testRegistryContentForFlowPort() {
+			Assert.assertTrue("FlowPort element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowPort_3069"));
+		}
+
+	    @Test
+		public void testRegistryContentForFlowSpecification_3087() {
+			Assert.assertTrue("FlowSpecification (3087) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowSpecification_3087"));
+		}
+
+	    @Test
+		public void testRegistryContentForFlowSpecification_2076() {
+			Assert.assertTrue("FlowSpecification (2076) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.FlowSpecification_2076"));
+		}
 
 }
diff --git a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14UMLClassDiagramElementTypesTest.java b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14UMLClassDiagramElementTypesTest.java
index 6fadf2fbb44..6db4105cd36 100644
--- a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14UMLClassDiagramElementTypesTest.java
+++ b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.diagram.common.tests/src/org/eclipse/papyrus/sysml14/diagram/common/tests/SysML14UMLClassDiagramElementTypesTest.java
@@ -155,6 +155,11 @@ public class SysML14UMLClassDiagramElementTypesTest {
 	}
 
     @Test
+	public void testRegistryContentForBlock_NestedBlock_Classifier() {
+		Assert.assertTrue("Block (NestedBlock_Classifier) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Block_NestedBlock_Classifier"));
+	}
+
+    @Test
 	public void testRegistryContentForBlock_3004() {
 		Assert.assertTrue("Block (3004) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Block_3004"));
 	}
@@ -655,119 +660,88 @@ public class SysML14UMLClassDiagramElementTypesTest {
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3002() {
-		Assert.assertTrue("Deprecated (3002) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3002"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3005() {
-		Assert.assertTrue("Deprecated (3005) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3005"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3006() {
-		Assert.assertTrue("Deprecated (3006) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3006"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3012() {
-		Assert.assertTrue("Deprecated (3012) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3012"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3018() {
-		Assert.assertTrue("Deprecated (3018) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3018"));
+	public void testRegistryContentForFlowPort_FlowPort_Label() {
+		Assert.assertTrue("FlowPort (FlowPort_Label) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_Label"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3041() {
-		Assert.assertTrue("Deprecated (3041) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Property_3041"));
+	public void testRegistryContentForFlowPort_3005() {
+		Assert.assertTrue("FlowPort (3005) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_3005"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_4021() {
-		Assert.assertTrue("Deprecated (4021) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_4021"));
+	public void testRegistryContentForFlowPort_3006() {
+		Assert.assertTrue("FlowPort (3006) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_3006"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_2001() {
-		Assert.assertTrue("Deprecated (2001) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_2001"));
+	public void testRegistryContentForFlowPort_3012() {
+		Assert.assertTrue("FlowPort (3012) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_3012"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3020() {
-		Assert.assertTrue("Deprecated (3020) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_InstanceSpecification_3020"));
+	public void testRegistryContentForFlowPort_3018() {
+		Assert.assertTrue("FlowPort (3018) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_3018"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_2008() {
-		Assert.assertTrue("Deprecated (2008) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Class_2008"));
+	public void testRegistryContentForFlowPort_3041() {
+		Assert.assertTrue("FlowPort (3041) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.FlowPort_3041"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3004() {
-		Assert.assertTrue("Deprecated (3004) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Class_3004"));
+	public void testRegistryContentForControlOperator_Operation_BorderItem() {
+		Assert.assertTrue("ControlOperator (Operation_BorderItem) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.ControlOperator_Operation_Operation_BorderItem"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3008() {
-		Assert.assertTrue("Deprecated (3008) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Class_3008"));
+	public void testRegistryContentForVerify_Link() {
+		Assert.assertTrue("Verify_Link element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Verify_Abstraction_Verify_Link"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3010() {
-		Assert.assertTrue("Deprecated (3010) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Class_3010"));
+	public void testRegistryContentForConstraint_Constraint_Label() {
+		Assert.assertTrue("Constraint (Constraint_Label) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Constraint_Label"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3014() {
-		Assert.assertTrue("Deprecated (3014) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Class_3014"));
+	public void testRegistryContentForActor() {
+		Assert.assertTrue("Actor element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Actor_2008"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_2015() {
-		Assert.assertTrue("Deprecated (2015) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Association_2015"));
+	public void testRegistryContentForUnit_2001() {
+		Assert.assertTrue("Unit_2001 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Unit_2001"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_4001() {
-		Assert.assertTrue("Deprecated (4001) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Association_4001"));
+	public void testRegistryContentForUnit_3020() {
+		Assert.assertTrue("Unit_3020 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Unit_3020"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_4019() {
-		Assert.assertTrue("Deprecated (4019) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Association_4019"));
+	public void testRegistryContentForQuantityKind_2001() {
+		Assert.assertTrue("QuantityKind_2001 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.QuantityKind_2001"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_Generalization() {
-		Assert.assertTrue("Deprecated Generalization element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_Generalization_4002"));
+	public void testRegistryContentForQuantityKind_3020() {
+		Assert.assertTrue("QuantityKind_3020 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.QuantityKind_3020"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_2010() {
-		Assert.assertTrue("Deprecated (2010) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_DataType_2010"));
+	public void testRegistryContentForPartAssociation_2015() {
+		Assert.assertTrue("PartAssociation_2015 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.PartAssociation_2015"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3027() {
-		Assert.assertTrue("Deprecated (3027) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_DataType_3027"));
+	public void testRegistryContentForPartAssociation_4001() {
+		Assert.assertTrue("PartAssociation_4001 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.PartAssociation_4001"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_3043() {
-		Assert.assertTrue("Deprecated (3043) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_DataType_3043"));
+	public void testRegistryContentForPartAssociation_4019() {
+		Assert.assertTrue("PartAssociation_4019 element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.PartAssociation_4019"));
 	}
 
-    @Test
-	public void testRegistryContentForDeprecated_3044() {
-		Assert.assertTrue("Deprecated (3044) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_DataType_3044"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_3045() {
-		Assert.assertTrue("Deprecated (3045) element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.sysML.Deprecated_DataType_3045"));
-	}
-
-
 }
diff --git a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/SysML14ElementTypesTest.java b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/SysML14ElementTypesTest.java
index c9e6afa0939..e5f80889a4d 100644
--- a/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/SysML14ElementTypesTest.java
+++ b/tests/junit/extraplugins/sysml14/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/SysML14ElementTypesTest.java
@@ -35,6 +35,7 @@ public class SysML14ElementTypesTest {
 		Assert.assertNotNull("The SysML 1.4 element type set definition is missing", elementTypeSetConfiguration);
 	}
 	
+
     @Test
 	public void testRegistryContentForValueType() {
 		Assert.assertTrue("ValueType element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.ValueType"));
@@ -401,39 +402,20 @@ public class SysML14ElementTypesTest {
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_ValueSpecification() {
-		Assert.assertTrue("Deprecated ValueSpecification element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_ValueSpecification"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_Property() {
-		Assert.assertTrue("Deprecated Property element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Property"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_InstanceSpecification() {
-		Assert.assertTrue("Deprecated InstanceSpecification element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_InstanceSpecification"));
-	}
-
-    @Test
-	public void testRegistryContentForDeprecated_Class() {
-		Assert.assertTrue("Deprecated Class element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Class"));
+	public void testRegistryContentForUnit() {
+		Assert.assertTrue("Unit element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Unit"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_Association() {
-		Assert.assertTrue("Deprecated Association element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Association"));
+	public void testRegistryContentForQuantityKind() {
+		Assert.assertTrue("QuantityKind element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.QuantityKind"));
 	}
 
     @Test
-	public void testRegistryContentForDeprecated_Generalization() {
-		Assert.assertTrue("Deprecated Generalization element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_Generalization"));
+	public void testRegistryContentForPartAssociation() {
+		Assert.assertTrue("PartAssociation element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.PartAssociation"));
 	}
 
-    @Test
-	public void testRegistryContentForDeprecated_DataType() {
-		Assert.assertTrue("Deprecated DataType element type not found in SysML element type set ", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.SysML14.Deprecated_DataType"));
-	}
 
 
 }