From ff3b12c3908c27b205b3da3c848f45e596eb2eae Mon Sep 17 00:00:00 2001
From: Géry Deloge
Date: Tue, 26 Apr 2016 15:04:40 +0200
Subject: Bug 492103: [BPMN] Cannot create element from the palette   -
 migration of Element Types

Signed-off-by: Géry Deloge <gery.deloge@gmail.com>
---
 .../model/collaboration.elementtypesconfigurations | 452 ++++++++++----------
 .../collaborationCustom.elementtypesconfigurations |   4 +-
 .../model/process.elementtypesconfigurations       | 454 ++++++++++-----------
 .../model/processCustom.elementtypesconfigurations |   4 +-
 .../org.eclipse.papyrus.bpmn/model/bpmn.assistants | 196 ++++-----
 5 files changed, 555 insertions(+), 555 deletions(-)

(limited to 'extraplugins')

diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.elementtypesconfigurations
index 2bea82d145a..310769be429 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.elementtypesconfigurations
@@ -1,577 +1,577 @@
 <?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.collaboration.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.collaboration.InclusiveGateway_JoinNode_3041" name="InclusiveGateway JoinNode" xmi:id="_s7URMQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.InclusiveGateway_JoinNode_3041" name="InclusiveGateway JoinNode" xmi:id="_s7URMQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URMgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.collaboration.InclusiveGateway_ForkNode_3040" name="InclusiveGateway ForkNode" xmi:id="_s7URMwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.InclusiveGateway_ForkNode_3040" name="InclusiveGateway ForkNode" xmi:id="_s7URMwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_ForkNode_3040" name="EventBasedGateway ForkNode" xmi:id="_s7URNQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_ForkNode_3040" name="EventBasedGateway ForkNode" xmi:id="_s7URNQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_StructuredActivityNode_3065" name="EventBasedGateway StructuredActivityNode" xmi:id="_s7URNwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_StructuredActivityNode_3065" name="EventBasedGateway StructuredActivityNode" xmi:id="_s7URNwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UROAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3068" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_InterruptibleActivityRegion_3068" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_s7UROQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InterruptibleActivityRegion_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.EventBasedGateway_InterruptibleActivityRegion_3068" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_s7UROQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_s7UROgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.collaboration.NonExclusiveGateway_JoinNode_3041" name="NonExclusiveGateway JoinNode" xmi:id="_s7UROwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.NonExclusiveGateway_JoinNode_3041" name="NonExclusiveGateway JoinNode" xmi:id="_s7UROwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URPAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.collaboration.NonExclusiveGateway_ForkNode_3040" name="NonExclusiveGateway ForkNode" xmi:id="_s7URPQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.NonExclusiveGateway_ForkNode_3040" name="NonExclusiveGateway ForkNode" xmi:id="_s7URPQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URPgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.collaboration.ParallelGateway_JoinNode_3041" name="ParallelGateway JoinNode" xmi:id="_s7URPwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ParallelGateway_JoinNode_3041" name="ParallelGateway JoinNode" xmi:id="_s7URPwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URQAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.collaboration.ParallelGateway_ForkNode_3040" name="ParallelGateway ForkNode" xmi:id="_s7URQQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ParallelGateway_ForkNode_3040" name="ParallelGateway ForkNode" xmi:id="_s7URQQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URQgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexGateway_JoinNode_3041" name="ComplexGateway JoinNode" xmi:id="_s7URQwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexGateway_JoinNode_3041" name="ComplexGateway JoinNode" xmi:id="_s7URQwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URRAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexGateway_ForkNode_3040" name="ComplexGateway ForkNode" xmi:id="_s7URRQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexGateway_ForkNode_3040" name="ComplexGateway ForkNode" xmi:id="_s7URRQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URRgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.bpmn.collaboration.ExclusiveGateway_DecisionNode_3038" name="ExclusiveGateway DecisionNode" xmi:id="_s7URRwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DecisionNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ExclusiveGateway_DecisionNode_3038" name="ExclusiveGateway DecisionNode" xmi:id="_s7URRwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_s7URSAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DecisionNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.bpmn.collaboration.ExclusiveGateway_MergeNode_3039" name="ExclusiveGateway MergeNode" xmi:id="_s7URSQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="MergeNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ExclusiveGateway_MergeNode_3039" name="ExclusiveGateway MergeNode" xmi:id="_s7URSQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_s7URSgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.MergeNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations hint="PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.bpmn.collaboration.Definitions_Package_PapyrusUMLActivityDiagram" name="Definitions Package" xmi:id="_s7URSwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_s7URTAkGEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Package_1000</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ActivityDiagram</specializedTypesID>
     <matcherConfiguration xmi:id="_s7URTQkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.collaboration.LaneSet_ActivityPartition_3067" name="LaneSet ActivityPartition" xmi:id="_s7URTgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.LaneSet_ActivityPartition_3067" name="LaneSet ActivityPartition" xmi:id="_s7URTgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URTwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProcess_Activity_2001" name="BPMNProcess (2001)" xmi:id="_s7URUAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Activity_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProcess_Activity_2001" name="BPMNProcess (2001)" xmi:id="_s7URUAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProcess_Activity</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Activity_2001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Activity_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProcess_Activity_3083" name="BPMNProcess (3083)" xmi:id="_s7URUgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Activity_Shape_CN" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProcess_Activity_3083" name="BPMNProcess (3083)" xmi:id="_s7URUgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProcess_Activity</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Activity_3083</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Activity_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.collaboration.Lane_ActivityPartition_3067" name="Lane ActivityPartition" xmi:id="_s7URVAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.Lane_ActivityPartition_3067" name="Lane ActivityPartition" xmi:id="_s7URVAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URVQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Lane_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.EndEvent_CallOperationAction_3010" name="EndEvent CallOperationAction" xmi:id="_s7URVgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.EndEvent_CallOperationAction_3010" name="EndEvent CallOperationAction" xmi:id="_s7URVgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URVwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.collaboration.EndEvent_FlowFinalNode_3006" name="EndEvent FlowFinalNode" xmi:id="_s7URWAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.EndEvent_FlowFinalNode_3006" name="EndEvent FlowFinalNode" xmi:id="_s7URWAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URWQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.collaboration.CatchEvent_AcceptEventAction_3063" name="CatchEvent AcceptEventAction" xmi:id="_s7URWgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.CatchEvent_AcceptEventAction_3063" name="CatchEvent AcceptEventAction" xmi:id="_s7URWgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URWwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.collaboration.CatchEvent_InitialNode_3004" name="CatchEvent InitialNode" xmi:id="_s7URXAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.CatchEvent_InitialNode_3004" name="CatchEvent InitialNode" xmi:id="_s7URXAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URXQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.CatchEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.collaboration.StartEvent_AcceptEventAction_3063" name="StartEvent AcceptEventAction" xmi:id="_s7URXgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.StartEvent_AcceptEventAction_3063" name="StartEvent AcceptEventAction" xmi:id="_s7URXgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URXwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.collaboration.StartEvent_InitialNode_3004" name="StartEvent InitialNode" xmi:id="_s7URYAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.StartEvent_InitialNode_3004" name="StartEvent InitialNode" xmi:id="_s7URYAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URYQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StartEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateCatchEvent_AcceptEventAction_3063" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_s7URYgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateCatchEvent_AcceptEventAction_3063" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_s7URYgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URYwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateCatchEvent_InitialNode_3004" name="IntermediateCatchEvent InitialNode" xmi:id="_s7URZAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateCatchEvent_InitialNode_3004" name="IntermediateCatchEvent InitialNode" xmi:id="_s7URZAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URZQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_SendObjectAction_3042" name="IntermediateThrowEvent SendObjectAction" xmi:id="_s7URZgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="SendObjectAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_SendObjectAction_3042" name="IntermediateThrowEvent SendObjectAction" xmi:id="_s7URZgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_s7URZwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.SendObjectAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_CallOperationAction_3010" name="IntermediateThrowEvent CallOperationAction" xmi:id="_s7URaAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_CallOperationAction_3010" name="IntermediateThrowEvent CallOperationAction" xmi:id="_s7URaAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URaQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_FlowFinalNode_3006" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_s7URagkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.IntermediateThrowEvent_FlowFinalNode_3006" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_s7URagkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URawkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.ThrowEvent_CallOperationAction_3010" name="ThrowEvent CallOperationAction" xmi:id="_s7URbAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ThrowEvent_CallOperationAction_3010" name="ThrowEvent CallOperationAction" xmi:id="_s7URbAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URbQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.collaboration.ThrowEvent_FlowFinalNode_3006" name="ThrowEvent FlowFinalNode" xmi:id="_s7URbgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ThrowEvent_FlowFinalNode_3006" name="ThrowEvent FlowFinalNode" xmi:id="_s7URbgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URbwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.collaboration.BoundaryEvent_AcceptEventAction_3063" name="BoundaryEvent AcceptEventAction" xmi:id="_s7URcAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BoundaryEvent_AcceptEventAction_3063" name="BoundaryEvent AcceptEventAction" xmi:id="_s7URcAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URcQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.collaboration.BoundaryEvent_InitialNode_3004" name="BoundaryEvent InitialNode" xmi:id="_s7URcgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BoundaryEvent_InitialNode_3004" name="BoundaryEvent InitialNode" xmi:id="_s7URcgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URcwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.ImplicitThrowEvent_CallOperationAction_3010" name="ImplicitThrowEvent CallOperationAction" xmi:id="_s7URdAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ImplicitThrowEvent_CallOperationAction_3010" name="ImplicitThrowEvent CallOperationAction" xmi:id="_s7URdAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URdQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.collaboration.ImplicitThrowEvent_FlowFinalNode_3006" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_s7URdgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ImplicitThrowEvent_FlowFinalNode_3006" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_s7URdgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URdwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.bpmn.collaboration.TextAnnotation_Comment_3080" name="TextAnnotation Comment" xmi:id="_s7UReAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.TextAnnotation_Comment_3080" name="TextAnnotation Comment" xmi:id="_s7UReAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UReQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.TextAnnotation_Comment</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Comment_3080</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Comment_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.collaboration.Group_ActivityPartition_3067" name="Group ActivityPartition" xmi:id="_s7URegkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.Group_ActivityPartition_3067" name="Group ActivityPartition" xmi:id="_s7URegkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URewkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Group_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.bpmn.collaboration.SequenceFlow_ControlFlow_4004" name="SequenceFlow ControlFlow" xmi:id="_s7URfAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmn.collaboration.SequenceFlow_ControlFlow_4004" name="SequenceFlow ControlFlow" xmi:id="_s7URfAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7URfQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ControlFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.collaboration.DataObjectReference_DataStoreNode_3078" name="DataObjectReference DataStoreNode" xmi:id="_s7URfgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataObjectReference_DataStoreNode_3078" name="DataObjectReference DataStoreNode" xmi:id="_s7URfgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URfwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataObjectReference_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutputAssociation_ObjectFlow_4003" name="DataOutputAssociation ObjectFlow" xmi:id="_s7URgAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutputAssociation_ObjectFlow_4003" name="DataOutputAssociation ObjectFlow" xmi:id="_s7URgAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URgQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutputAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3014" name="DataOutput (3014)" xmi:id="_s7URggkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_OpaqueActionOutputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3014" name="DataOutput (3014)" xmi:id="_s7URggkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URgwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3020" name="DataOutput (3020)" xmi:id="_s7URhAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CallBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3020" name="DataOutput (3020)" xmi:id="_s7URhAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3024" name="DataOutput (3024)" xmi:id="_s7URhgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CallOperationActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3024" name="DataOutput (3024)" xmi:id="_s7URhgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3064" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3064" name="DataOutput (3064)" xmi:id="_s7URiAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_AcceptEventActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3064" name="DataOutput (3064)" xmi:id="_s7URiAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3077" name="DataOutput (3077)" xmi:id="_s7URigkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ValueSpecificationActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3077" name="DataOutput (3077)" xmi:id="_s7URigkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3084" name="DataOutput (3084)" xmi:id="_s7URjAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadSelfActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3084" name="DataOutput (3084)" xmi:id="_s7URjAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3087" name="DataOutput (3087)" xmi:id="_s7URjgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CreateObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3087" name="DataOutput (3087)" xmi:id="_s7URjgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3090" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3090" name="DataOutput (3090)" xmi:id="_s7URkAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3090" name="DataOutput (3090)" xmi:id="_s7URkAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3094" name="DataOutput (3094)" xmi:id="_s7URkgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_AddStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3094" name="DataOutput (3094)" xmi:id="_s7URkgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3098" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3098" name="DataOutput (3098)" xmi:id="_s7URlAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadVariableActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3098" name="DataOutput (3098)" xmi:id="_s7URlAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3109" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3109" name="DataOutput (3109)" xmi:id="_s7URlgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_LoopNodeBodyOutputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3109" name="DataOutput (3109)" xmi:id="_s7URlgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3111" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3111" name="DataOutput (3111)" xmi:id="_s7URmAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_LoopNodeResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3111" name="DataOutput (3111)" xmi:id="_s7URmAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3191" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3191" name="DataOutput (3191)" xmi:id="_s7URmgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_StructuredActivityNodeOutputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3191" name="DataOutput (3191)" xmi:id="_s7URmgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3125" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3125" name="DataOutput (3125)" xmi:id="_s7URnAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_StartObjectBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3125" name="DataOutput (3125)" xmi:id="_s7URnAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3126" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3126" name="DataOutput (3126)" xmi:id="_s7URngkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_TestIdentityActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3126" name="DataOutput (3126)" xmi:id="_s7URngkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3127" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3127" name="DataOutput (3127)" xmi:id="_s7URoAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ClearStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3127" name="DataOutput (3127)" xmi:id="_s7URoAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URoQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3128" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3128" name="DataOutput (3128)" xmi:id="_s7URogkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadLinkActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3128" name="DataOutput (3128)" xmi:id="_s7URogkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URowkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3129" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3129" name="DataOutput (3129)" xmi:id="_s7URpAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadExtentActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3129" name="DataOutput (3129)" xmi:id="_s7URpAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3130" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3130" name="DataOutput (3130)" xmi:id="_s7URpgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadIsClassifiedObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3130" name="DataOutput (3130)" xmi:id="_s7URpgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3131" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3131" name="DataOutput (3131)" xmi:id="_s7URqAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReduceActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3131" name="DataOutput (3131)" xmi:id="_s7URqAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3202" name="DataOutput (3202)" xmi:id="_s7URqgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CreateLinkObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3202" name="DataOutput (3202)" xmi:id="_s7URqgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_Parameter_3001" name="DataOutput Parameter" xmi:id="_s7URrAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_Parameter_3001" name="DataOutput Parameter" xmi:id="_s7URrAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7URrQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_Parameter</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Parameter_3001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Parameter_ParameterLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_ActivityParameterNode_3059" name="DataOutput ActivityParameterNode" xmi:id="_s7URrgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataOutput_ActivityParameterNode_3059" name="DataOutput ActivityParameterNode" xmi:id="_s7URrgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7URrwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityParameterNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProperty_DataStoreNode_3078" name="BPMNProperty DataStoreNode" xmi:id="_s7URsAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNProperty_DataStoreNode_3078" name="BPMNProperty DataStoreNode" xmi:id="_s7URsAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URsQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProperty_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInputAssociation_ObjectFlow_4003" name="DataInputAssociation ObjectFlow" xmi:id="_s7URsgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInputAssociation_ObjectFlow_4003" name="DataInputAssociation ObjectFlow" xmi:id="_s7URsgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URswkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInputAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.collaboration.DataStoreReference_DataStoreNode_3078" name="DataStoreReference DataStoreNode" xmi:id="_s7URtAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataStoreReference_DataStoreNode_3078" name="DataStoreReference DataStoreNode" xmi:id="_s7URtAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.collaboration.DataObject_DataStoreNode_3078" name="DataObject DataStoreNode" xmi:id="_s7URtgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataObject_DataStoreNode_3078" name="DataObject DataStoreNode" xmi:id="_s7URtgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataObject_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3013" name="DataInput (3013)" xmi:id="_s7URuAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3013" name="DataInput (3013)" xmi:id="_s7URuAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3013</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3019" name="DataInput (3019)" xmi:id="_s7URugkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3019" name="DataInput (3019)" xmi:id="_s7URugkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3019</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3023" name="DataInput (3023)" xmi:id="_s7URvAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3023" name="DataInput (3023)" xmi:id="_s7URvAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3023</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3055" name="DataInput (3055)" xmi:id="_s7URvgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3055" name="DataInput (3055)" xmi:id="_s7URvgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3055</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3089" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3089" name="DataInput (3089)" xmi:id="_s7URwAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3089" name="DataInput (3089)" xmi:id="_s7URwAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3089</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3092" name="DataInput (3092)" xmi:id="_s7URwgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3092" name="DataInput (3092)" xmi:id="_s7URwgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3092</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3096" name="DataInput (3096)" xmi:id="_s7URxAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3096" name="DataInput (3096)" xmi:id="_s7URxAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3096</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3101" name="DataInput (3101)" xmi:id="_s7URxgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3101" name="DataInput (3101)" xmi:id="_s7URxgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3101</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3103" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3103" name="DataInput (3103)" xmi:id="_s7URyAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3103" name="DataInput (3103)" xmi:id="_s7URyAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URyQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3103</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3105" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3105" name="DataInput (3105)" xmi:id="_s7URygkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3105" name="DataInput (3105)" xmi:id="_s7URygkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URywkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3105</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3188" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3188" name="DataInput (3188)" xmi:id="_s7URzAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3188" name="DataInput (3188)" xmi:id="_s7URzAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3188</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3133" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3133" name="DataInput (3133)" xmi:id="_s7URzgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3133" name="DataInput (3133)" xmi:id="_s7URzgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3133</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3134" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3134" name="DataInput (3134)" xmi:id="_s7UR0AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3134" name="DataInput (3134)" xmi:id="_s7UR0AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3134</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3136" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3136" name="DataInput (3136)" xmi:id="_s7UR0gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3136" name="DataInput (3136)" xmi:id="_s7UR0gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3136</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3137" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3137" name="DataInput (3137)" xmi:id="_s7UR1AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3137" name="DataInput (3137)" xmi:id="_s7UR1AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3137</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3138" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3138" name="DataInput (3138)" xmi:id="_s7UR1gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3138" name="DataInput (3138)" xmi:id="_s7UR1gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3138</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3139" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3139" name="DataInput (3139)" xmi:id="_s7UR2AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3139" name="DataInput (3139)" xmi:id="_s7UR2AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3139</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3140" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3140" name="DataInput (3140)" xmi:id="_s7UR2gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3140" name="DataInput (3140)" xmi:id="_s7UR2gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3140</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3141" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3141" name="DataInput (3141)" xmi:id="_s7UR3AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3141" name="DataInput (3141)" xmi:id="_s7UR3AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3141</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3142" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3142" name="DataInput (3142)" xmi:id="_s7UR3gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3142" name="DataInput (3142)" xmi:id="_s7UR3gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3142</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3143" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3143" name="DataInput (3143)" xmi:id="_s7UR4AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3143" name="DataInput (3143)" xmi:id="_s7UR4AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3143</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3144" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3144" name="DataInput (3144)" xmi:id="_s7UR4gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3144" name="DataInput (3144)" xmi:id="_s7UR4gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3144</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3199" name="DataInput (3199)" xmi:id="_s7UR5AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_InputPin_3199" name="DataInput (3199)" xmi:id="_s7UR5AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR5QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3199</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_Parameter_3001" name="DataInput Parameter" xmi:id="_s7UR5gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_Parameter_3001" name="DataInput Parameter" xmi:id="_s7UR5gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7UR5wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_Parameter</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Parameter_3001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Parameter_ParameterLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_ActivityParameterNode_3059" name="DataInput ActivityParameterNode" xmi:id="_s7UR6AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.DataInput_ActivityParameterNode_3059" name="DataInput ActivityParameterNode" xmi:id="_s7UR6AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7UR6QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityParameterNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.collaboration.DataAssociation_ObjectFlow_4003" name="DataAssociation ObjectFlow" xmi:id="_s7UR6gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.collaboration.DataAssociation_ObjectFlow_4003" name="DataAssociation ObjectFlow" xmi:id="_s7UR6gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7UR6wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.collaboration.UserTask_OpaqueAction_3007" name="UserTask OpaqueAction" xmi:id="_s7UR7AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.UserTask_OpaqueAction_3007" name="UserTask OpaqueAction" xmi:id="_s7UR7AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.UserTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.collaboration.ManualTask_OpaqueAction_3007" name="ManualTask OpaqueAction" xmi:id="_s7UR7gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ManualTask_OpaqueAction_3007" name="ManualTask OpaqueAction" xmi:id="_s7UR7gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.bpmn.collaboration.Documentation_Comment_3080" name="Documentation Comment" xmi:id="_s7UR8AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.Documentation_Comment_3080" name="Documentation Comment" xmi:id="_s7UR8AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UR8QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Documentation_Comment</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Comment_3080</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Comment_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3002" name="BPMNRelationship (3002)" xmi:id="_s7UR8gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_PreconditionLabel" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3002" name="BPMNRelationship (3002)" xmi:id="_s7UR8gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR8wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3002</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_PreconditionLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3003" name="BPMNRelationship (3003)" xmi:id="_s7UR9AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_PostconditionLabel" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3003" name="BPMNRelationship (3003)" xmi:id="_s7UR9AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_PostconditionLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3112" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3112" name="BPMNRelationship (3112)" xmi:id="_s7UR9gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BPMNRelationship_Constraint_3112" name="BPMNRelationship (3112)" xmi:id="_s7UR9gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3112</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.SubProcess_StructuredActivityNode_3065" name="SubProcess StructuredActivityNode" xmi:id="_s7UR-AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.SubProcess_StructuredActivityNode_3065" name="SubProcess StructuredActivityNode" xmi:id="_s7UR-AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.LoopCharacteristics_StructuredActivityNode_3065" name="LoopCharacteristics StructuredActivityNode" xmi:id="_s7UR-gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.LoopCharacteristics_StructuredActivityNode_3065" name="LoopCharacteristics StructuredActivityNode" xmi:id="_s7UR-gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.LoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations identifier="org.eclipse.papyrus.bpmn.collaboration.CallActivity_CallBehaviorAction" name="CallActivity CallBehaviorAction" xmi:id="_s7UR_AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_s7UR_QkGEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType</specializedTypesID>
     <matcherConfiguration xmi:id="_s7UR_gkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.collaboration.BusinessRuleTask_OpaqueAction_3007" name="BusinessRuleTask OpaqueAction" xmi:id="_s7UR_wkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.BusinessRuleTask_OpaqueAction_3007" name="BusinessRuleTask OpaqueAction" xmi:id="_s7UR_wkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USAAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexBehaviorDefinition_ControlFlow_4004" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_s7USAQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmn.collaboration.ComplexBehaviorDefinition_ControlFlow_4004" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_s7USAQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7USAgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_ControlFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ControlFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.AdHocSubProcess_StructuredActivityNode_3065" name="AdHocSubProcess StructuredActivityNode" xmi:id="_s7USAwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.AdHocSubProcess_StructuredActivityNode_3065" name="AdHocSubProcess StructuredActivityNode" xmi:id="_s7USAwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USBAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.AdHocSubProcess_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.collaboration.ScriptTask_OpaqueAction_3007" name="ScriptTask OpaqueAction" xmi:id="_s7USBQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ScriptTask_OpaqueAction_3007" name="ScriptTask OpaqueAction" xmi:id="_s7USBQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USBgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.SendTask_CallOperationAction_3010" name="SendTask CallOperationAction" xmi:id="_s7USBwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.SendTask_CallOperationAction_3010" name="SendTask CallOperationAction" xmi:id="_s7USBwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USCAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SendTask_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.Transaction_StructuredActivityNode_3065" name="Transaction StructuredActivityNode" xmi:id="_s7USCQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.Transaction_StructuredActivityNode_3065" name="Transaction StructuredActivityNode" xmi:id="_s7USCQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USCgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Transaction_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.bpmn.collaboration.StandardLoopCharacteristics_LoopNode_3071" name="StandardLoopCharacteristics LoopNode" xmi:id="_s7USCwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="LoopNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.StandardLoopCharacteristics_LoopNode_3071" name="StandardLoopCharacteristics LoopNode" xmi:id="_s7USCwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_s7USDAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_LoopNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.LoopNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.StandardLoopCharacteristics_StructuredActivityNode_3065" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_s7USDQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.StandardLoopCharacteristics_StructuredActivityNode_3065" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_s7USDQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USDgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.collaboration.ReceiveTask_AcceptEventAction_3063" name="ReceiveTask AcceptEventAction" xmi:id="_s7USDwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ReceiveTask_AcceptEventAction_3063" name="ReceiveTask AcceptEventAction" xmi:id="_s7USDwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7USEAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ReceiveTask_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.collaboration.ServiceTask_CallOperationAction_3010" name="ServiceTask CallOperationAction" xmi:id="_s7USEQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.ServiceTask_CallOperationAction_3010" name="ServiceTask CallOperationAction" xmi:id="_s7USEQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USEgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.bpmn.collaboration.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_s7USEwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ExpansionRegion_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_s7USEwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_s7USFAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_ExpansionRegion</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ExpansionRegion_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.collaboration.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_s7USFQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_s7USFQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USFgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.collaboration.definitions_PapyrusUMLActivityDiagram" target="_s7URSwkGEeWVleXnap4Kwg" xmi:id="_s7USFwkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
     <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_s7USGAkGEeWVleXnap4Kwg">
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaborationCustom.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaborationCustom.elementtypesconfigurations
index 58fa064094b..e6380b84da3 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaborationCustom.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaborationCustom.elementtypesconfigurations
@@ -3,9 +3,9 @@
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ODZj0RBDEeWXVJ4WhgYiRw"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Lane_ActivityPartition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.collaboration.Task_Action_3007" name="Task Action" xmi:id="_s7UR7gkGEeWVleXnap4Kwg3" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.collaboration.Task_Action_3007" name="Task Action" xmi:id="_s7UR7gkGEeWVleXnap4Kwg3" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7wkGEeWVleXnap4Kwg4"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Task_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.elementtypesconfigurations
index 08fc41f1421..1ea037f89b4 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.elementtypesconfigurations
@@ -1,577 +1,577 @@
 <?xml version="1.0" encoding="ASCII" standalone="no"?><elementtypesconfigurations:ElementTypeSetConfiguration xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.1" xmlns:applystereotypeadvice="http://www.eclipse.org/papyrus/uml/types/applystereotypeadvice/1.1" xmlns:stereotypematcher="http://www.eclipse.org/papyrus/uml/types/stereotypematcher/1.1" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" identifier="org.eclipse.papyrus.bpmn.process.elementTypes" metamodelNsURI="http://www.eclipse.org/uml2/5.0.0/UML" name="BPMNProfile" xmi:id="_s7URMAkGEeWVleXnap4Kwg" xmi:version="2.0">
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.process.InclusiveGateway_JoinNode_3041" name="InclusiveGateway JoinNode" xmi:id="_s7URMQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.InclusiveGateway_JoinNode_3041" name="InclusiveGateway JoinNode" xmi:id="_s7URMQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URMgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.InclusiveGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.process.InclusiveGateway_ForkNode_3040" name="InclusiveGateway ForkNode" xmi:id="_s7URMwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.InclusiveGateway_ForkNode_3040" name="InclusiveGateway ForkNode" xmi:id="_s7URMwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.InclusiveGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_ForkNode_3040" name="EventBasedGateway ForkNode" xmi:id="_s7URNQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_ForkNode_3040" name="EventBasedGateway ForkNode" xmi:id="_s7URNQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URNgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_StructuredActivityNode_3065" name="EventBasedGateway StructuredActivityNode" xmi:id="_s7URNwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_StructuredActivityNode_3065" name="EventBasedGateway StructuredActivityNode" xmi:id="_s7URNwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UROAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3068" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_InterruptibleActivityRegion_3068" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_s7UROQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InterruptibleActivityRegion_Shape" identifier="org.eclipse.papyrus.bpmn.process.EventBasedGateway_InterruptibleActivityRegion_3068" name="EventBasedGateway InterruptibleActivityRegion" xmi:id="_s7UROQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterruptibleActivityRegion.gif" xmi:id="_s7UROgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EventBasedGateway_InterruptibleActivityRegion</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.process.NonExclusiveGateway_JoinNode_3041" name="NonExclusiveGateway JoinNode" xmi:id="_s7UROwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.NonExclusiveGateway_JoinNode_3041" name="NonExclusiveGateway JoinNode" xmi:id="_s7UROwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URPAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.NonExclusiveGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.process.NonExclusiveGateway_ForkNode_3040" name="NonExclusiveGateway ForkNode" xmi:id="_s7URPQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.NonExclusiveGateway_ForkNode_3040" name="NonExclusiveGateway ForkNode" xmi:id="_s7URPQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URPgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.NonExclusiveGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.process.ParallelGateway_JoinNode_3041" name="ParallelGateway JoinNode" xmi:id="_s7URPwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ParallelGateway_JoinNode_3041" name="ParallelGateway JoinNode" xmi:id="_s7URPwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URQAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ParallelGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.process.ParallelGateway_ForkNode_3040" name="ParallelGateway ForkNode" xmi:id="_s7URQQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ParallelGateway_ForkNode_3040" name="ParallelGateway ForkNode" xmi:id="_s7URQQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URQgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ParallelGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3041" identifier="org.eclipse.papyrus.bpmn.process.ComplexGateway_JoinNode_3041" name="ComplexGateway JoinNode" xmi:id="_s7URQwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="JoinNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ComplexGateway_JoinNode_3041" name="ComplexGateway JoinNode" xmi:id="_s7URQwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/JoinNode.gif" xmi:id="_s7URRAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexGateway_JoinNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.JoinNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3040" identifier="org.eclipse.papyrus.bpmn.process.ComplexGateway_ForkNode_3040" name="ComplexGateway ForkNode" xmi:id="_s7URRQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ForkNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ComplexGateway_ForkNode_3040" name="ComplexGateway ForkNode" xmi:id="_s7URRQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ForkNode.gif" xmi:id="_s7URRgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexGateway_ForkNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ForkNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3038" identifier="org.eclipse.papyrus.bpmn.process.ExclusiveGateway_DecisionNode_3038" name="ExclusiveGateway DecisionNode" xmi:id="_s7URRwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DecisionNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ExclusiveGateway_DecisionNode_3038" name="ExclusiveGateway DecisionNode" xmi:id="_s7URRwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DecisionNode.gif" xmi:id="_s7URSAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ExclusiveGateway_DecisionNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DecisionNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3039" identifier="org.eclipse.papyrus.bpmn.process.ExclusiveGateway_MergeNode_3039" name="ExclusiveGateway MergeNode" xmi:id="_s7URSQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="MergeNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ExclusiveGateway_MergeNode_3039" name="ExclusiveGateway MergeNode" xmi:id="_s7URSQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/MergeNode.gif" xmi:id="_s7URSgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ExclusiveGateway_MergeNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.MergeNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations hint="PapyrusUMLActivityDiagram" identifier="org.eclipse.papyrus.bpmn.process.Definitions_Package_PapyrusUMLActivityDiagram" name="Definitions Package" xmi:id="_s7URSwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif" xmi:id="_s7URTAkGEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Package_1000</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Package_ActivityDiagram</specializedTypesID>
     <matcherConfiguration xmi:id="_s7URTQkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>BPMNProfile::Definitions</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.process.LaneSet_ActivityPartition_3067" name="LaneSet ActivityPartition" xmi:id="_s7URTgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.process.LaneSet_ActivityPartition_3067" name="LaneSet ActivityPartition" xmi:id="_s7URTgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URTwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.LaneSet_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="2001" identifier="org.eclipse.papyrus.bpmn.process.BPMNProcess_Activity_2001" name="BPMNProcess (2001)" xmi:id="_s7URUAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Activity_Shape" identifier="org.eclipse.papyrus.bpmn.process.BPMNProcess_Activity_2001" name="BPMNProcess (2001)" xmi:id="_s7URUAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProcess_Activity</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Activity_2001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Activity_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3083" identifier="org.eclipse.papyrus.bpmn.process.BPMNProcess_Activity_3083" name="BPMNProcess (3083)" xmi:id="_s7URUgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Activity_Shape_CN" identifier="org.eclipse.papyrus.bpmn.process.BPMNProcess_Activity_3083" name="BPMNProcess (3083)" xmi:id="_s7URUgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Activity.gif" xmi:id="_s7URUwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProcess_Activity</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Activity_3083</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Activity_Shape_CN</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.process.Lane_ActivityPartition_3067" name="Lane ActivityPartition" xmi:id="_s7URVAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.process.Lane_ActivityPartition_3067" name="Lane ActivityPartition" xmi:id="_s7URVAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URVQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Lane_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.EndEvent_CallOperationAction_3010" name="EndEvent CallOperationAction" xmi:id="_s7URVgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.EndEvent_CallOperationAction_3010" name="EndEvent CallOperationAction" xmi:id="_s7URVgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URVwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EndEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.process.EndEvent_FlowFinalNode_3006" name="EndEvent FlowFinalNode" xmi:id="_s7URWAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.EndEvent_FlowFinalNode_3006" name="EndEvent FlowFinalNode" xmi:id="_s7URWAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URWQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.EndEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.process.CatchEvent_AcceptEventAction_3063" name="CatchEvent AcceptEventAction" xmi:id="_s7URWgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.CatchEvent_AcceptEventAction_3063" name="CatchEvent AcceptEventAction" xmi:id="_s7URWgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URWwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.CatchEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.process.CatchEvent_InitialNode_3004" name="CatchEvent InitialNode" xmi:id="_s7URXAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.CatchEvent_InitialNode_3004" name="CatchEvent InitialNode" xmi:id="_s7URXAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URXQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.CatchEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.process.StartEvent_AcceptEventAction_3063" name="StartEvent AcceptEventAction" xmi:id="_s7URXgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.StartEvent_AcceptEventAction_3063" name="StartEvent AcceptEventAction" xmi:id="_s7URXgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URXwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StartEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.process.StartEvent_InitialNode_3004" name="StartEvent InitialNode" xmi:id="_s7URYAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.StartEvent_InitialNode_3004" name="StartEvent InitialNode" xmi:id="_s7URYAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URYQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StartEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.process.IntermediateCatchEvent_AcceptEventAction_3063" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_s7URYgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.IntermediateCatchEvent_AcceptEventAction_3063" name="IntermediateCatchEvent AcceptEventAction" xmi:id="_s7URYgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URYwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateCatchEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.process.IntermediateCatchEvent_InitialNode_3004" name="IntermediateCatchEvent InitialNode" xmi:id="_s7URZAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.IntermediateCatchEvent_InitialNode_3004" name="IntermediateCatchEvent InitialNode" xmi:id="_s7URZAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URZQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateCatchEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3042" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_SendObjectAction_3042" name="IntermediateThrowEvent SendObjectAction" xmi:id="_s7URZgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="SendObjectAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_SendObjectAction_3042" name="IntermediateThrowEvent SendObjectAction" xmi:id="_s7URZgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/SendObjectAction.gif" xmi:id="_s7URZwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_SendObjectAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.SendObjectAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_CallOperationAction_3010" name="IntermediateThrowEvent CallOperationAction" xmi:id="_s7URaAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_CallOperationAction_3010" name="IntermediateThrowEvent CallOperationAction" xmi:id="_s7URaAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URaQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_FlowFinalNode_3006" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_s7URagkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.IntermediateThrowEvent_FlowFinalNode_3006" name="IntermediateThrowEvent FlowFinalNode" xmi:id="_s7URagkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URawkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.IntermediateThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.ThrowEvent_CallOperationAction_3010" name="ThrowEvent CallOperationAction" xmi:id="_s7URbAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ThrowEvent_CallOperationAction_3010" name="ThrowEvent CallOperationAction" xmi:id="_s7URbAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URbQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.process.ThrowEvent_FlowFinalNode_3006" name="ThrowEvent FlowFinalNode" xmi:id="_s7URbgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ThrowEvent_FlowFinalNode_3006" name="ThrowEvent FlowFinalNode" xmi:id="_s7URbgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URbwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.process.BoundaryEvent_AcceptEventAction_3063" name="BoundaryEvent AcceptEventAction" xmi:id="_s7URcAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.BoundaryEvent_AcceptEventAction_3063" name="BoundaryEvent AcceptEventAction" xmi:id="_s7URcAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7URcQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BoundaryEvent_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3004" identifier="org.eclipse.papyrus.bpmn.process.BoundaryEvent_InitialNode_3004" name="BoundaryEvent InitialNode" xmi:id="_s7URcgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InitialNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.BoundaryEvent_InitialNode_3004" name="BoundaryEvent InitialNode" xmi:id="_s7URcgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InitialNode.gif" xmi:id="_s7URcwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BoundaryEvent_InitialNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InitialNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.ImplicitThrowEvent_CallOperationAction_3010" name="ImplicitThrowEvent CallOperationAction" xmi:id="_s7URdAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ImplicitThrowEvent_CallOperationAction_3010" name="ImplicitThrowEvent CallOperationAction" xmi:id="_s7URdAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7URdQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ImplicitThrowEvent_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3006" identifier="org.eclipse.papyrus.bpmn.process.ImplicitThrowEvent_FlowFinalNode_3006" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_s7URdgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="FlowFinalNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.ImplicitThrowEvent_FlowFinalNode_3006" name="ImplicitThrowEvent FlowFinalNode" xmi:id="_s7URdgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FlowFinalNode.gif" xmi:id="_s7URdwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ImplicitThrowEvent_FlowFinalNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.FlowFinalNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.bpmn.process.TextAnnotation_Comment_3080" name="TextAnnotation Comment" xmi:id="_s7UReAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmn.process.TextAnnotation_Comment_3080" name="TextAnnotation Comment" xmi:id="_s7UReAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UReQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.TextAnnotation_Comment</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Comment_3080</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Comment_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3067" identifier="org.eclipse.papyrus.bpmn.process.Group_ActivityPartition_3067" name="Group ActivityPartition" xmi:id="_s7URegkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityPartition_Shape" identifier="org.eclipse.papyrus.bpmn.process.Group_ActivityPartition_3067" name="Group ActivityPartition" xmi:id="_s7URegkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_s7URewkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Group_ActivityPartition</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityPartition_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.bpmn.process.SequenceFlow_ControlFlow_4004" name="SequenceFlow ControlFlow" xmi:id="_s7URfAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmn.process.SequenceFlow_ControlFlow_4004" name="SequenceFlow ControlFlow" xmi:id="_s7URfAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7URfQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SequenceFlow_ControlFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ControlFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.process.DataObjectReference_DataStoreNode_3078" name="DataObjectReference DataStoreNode" xmi:id="_s7URfgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.DataObjectReference_DataStoreNode_3078" name="DataObjectReference DataStoreNode" xmi:id="_s7URfgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URfwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataObjectReference_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.process.DataOutputAssociation_ObjectFlow_4003" name="DataOutputAssociation ObjectFlow" xmi:id="_s7URgAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.process.DataOutputAssociation_ObjectFlow_4003" name="DataOutputAssociation ObjectFlow" xmi:id="_s7URgAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URgQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutputAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3014" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3014" name="DataOutput (3014)" xmi:id="_s7URggkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_OpaqueActionOutputShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3014" name="DataOutput (3014)" xmi:id="_s7URggkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URgwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3020" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3020" name="DataOutput (3020)" xmi:id="_s7URhAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CallBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3020" name="DataOutput (3020)" xmi:id="_s7URhAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3024" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3024" name="DataOutput (3024)" xmi:id="_s7URhgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CallOperationActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3024" name="DataOutput (3024)" xmi:id="_s7URhgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URhwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3064" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3064" name="DataOutput (3064)" xmi:id="_s7URiAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_AcceptEventActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3064" name="DataOutput (3064)" xmi:id="_s7URiAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3077" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3077" name="DataOutput (3077)" xmi:id="_s7URigkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ValueSpecificationActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3077" name="DataOutput (3077)" xmi:id="_s7URigkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URiwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3084" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3084" name="DataOutput (3084)" xmi:id="_s7URjAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadSelfActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3084" name="DataOutput (3084)" xmi:id="_s7URjAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3087" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3087" name="DataOutput (3087)" xmi:id="_s7URjgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CreateObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3087" name="DataOutput (3087)" xmi:id="_s7URjgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URjwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3090" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3090" name="DataOutput (3090)" xmi:id="_s7URkAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3090" name="DataOutput (3090)" xmi:id="_s7URkAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3094" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3094" name="DataOutput (3094)" xmi:id="_s7URkgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_AddStructuralFeatureValueActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3094" name="DataOutput (3094)" xmi:id="_s7URkgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URkwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3098" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3098" name="DataOutput (3098)" xmi:id="_s7URlAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadVariableActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3098" name="DataOutput (3098)" xmi:id="_s7URlAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3109" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3109" name="DataOutput (3109)" xmi:id="_s7URlgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_LoopNodeBodyOutputShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3109" name="DataOutput (3109)" xmi:id="_s7URlgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URlwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3111" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3111" name="DataOutput (3111)" xmi:id="_s7URmAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_LoopNodeResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3111" name="DataOutput (3111)" xmi:id="_s7URmAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_LoopNodeResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3191" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3191" name="DataOutput (3191)" xmi:id="_s7URmgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_StructuredActivityNodeOutputShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3191" name="DataOutput (3191)" xmi:id="_s7URmgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URmwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3191</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_StructuredActivityNodeOutputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3125" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3125" name="DataOutput (3125)" xmi:id="_s7URnAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_StartObjectBehaviorActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3125" name="DataOutput (3125)" xmi:id="_s7URnAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3125</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_StartObjectBehaviorActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3126" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3126" name="DataOutput (3126)" xmi:id="_s7URngkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_TestIdentityActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3126" name="DataOutput (3126)" xmi:id="_s7URngkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URnwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3126</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_TestIdentityActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3127" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3127" name="DataOutput (3127)" xmi:id="_s7URoAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ClearStructuralFeatureActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3127" name="DataOutput (3127)" xmi:id="_s7URoAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URoQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3127</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ClearStructuralFeatureActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3128" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3128" name="DataOutput (3128)" xmi:id="_s7URogkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadLinkActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3128" name="DataOutput (3128)" xmi:id="_s7URogkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URowkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3128</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadLinkActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3129" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3129" name="DataOutput (3129)" xmi:id="_s7URpAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadExtentActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3129" name="DataOutput (3129)" xmi:id="_s7URpAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3129</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadExtentActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3130" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3130" name="DataOutput (3130)" xmi:id="_s7URpgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReadIsClassifiedObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3130" name="DataOutput (3130)" xmi:id="_s7URpgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URpwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3130</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReadIsClassifiedObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3131" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3131" name="DataOutput (3131)" xmi:id="_s7URqAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_ReduceActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3131" name="DataOutput (3131)" xmi:id="_s7URqAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3131</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_ReduceActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3202" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3202" name="DataOutput (3202)" xmi:id="_s7URqgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OutputPin_CreateLinkObjectActionResultShape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3202" name="DataOutput (3202)" xmi:id="_s7URqgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OutputPin.gif" xmi:id="_s7URqwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_OutputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OutputPin_3202</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OutputPin_CreateLinkObjectActionResultShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_Parameter_3001" name="DataOutput Parameter" xmi:id="_s7URrAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_Parameter_3001" name="DataOutput Parameter" xmi:id="_s7URrAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7URrQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_Parameter</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Parameter_3001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Parameter_ParameterLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_ActivityParameterNode_3059" name="DataOutput ActivityParameterNode" xmi:id="_s7URrgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.DataOutput_ActivityParameterNode_3059" name="DataOutput ActivityParameterNode" xmi:id="_s7URrgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7URrwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityParameterNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.process.BPMNProperty_DataStoreNode_3078" name="BPMNProperty DataStoreNode" xmi:id="_s7URsAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.BPMNProperty_DataStoreNode_3078" name="BPMNProperty DataStoreNode" xmi:id="_s7URsAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URsQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNProperty_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.process.DataInputAssociation_ObjectFlow_4003" name="DataInputAssociation ObjectFlow" xmi:id="_s7URsgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.process.DataInputAssociation_ObjectFlow_4003" name="DataInputAssociation ObjectFlow" xmi:id="_s7URsgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7URswkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInputAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.process.DataStoreReference_DataStoreNode_3078" name="DataStoreReference DataStoreNode" xmi:id="_s7URtAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.DataStoreReference_DataStoreNode_3078" name="DataStoreReference DataStoreNode" xmi:id="_s7URtAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataStoreReference_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3078" identifier="org.eclipse.papyrus.bpmn.process.DataObject_DataStoreNode_3078" name="DataObject DataStoreNode" xmi:id="_s7URtgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="DataStoreNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.DataObject_DataStoreNode_3078" name="DataObject DataStoreNode" xmi:id="_s7URtgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataStoreNode.gif" xmi:id="_s7URtwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataObject_DataStoreNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.DataStoreNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3013" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3013" name="DataInput (3013)" xmi:id="_s7URuAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_OpaqueActionInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3013" name="DataInput (3013)" xmi:id="_s7URuAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3013</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3019" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3019" name="DataInput (3019)" xmi:id="_s7URugkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CallBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3019" name="DataInput (3019)" xmi:id="_s7URugkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URuwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3019</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3023" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3023" name="DataInput (3023)" xmi:id="_s7URvAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CallOperationActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3023" name="DataInput (3023)" xmi:id="_s7URvAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3023</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3055" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3055" name="DataInput (3055)" xmi:id="_s7URvgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_SendSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3055" name="DataInput (3055)" xmi:id="_s7URvgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URvwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3055</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3089" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3089" name="DataInput (3089)" xmi:id="_s7URwAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReadStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3089" name="DataInput (3089)" xmi:id="_s7URwAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3089</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3092" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3092" name="DataInput (3092)" xmi:id="_s7URwgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_AddStructuralFeatureValueActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3092" name="DataInput (3092)" xmi:id="_s7URwgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URwwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3092</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3096" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3096" name="DataInput (3096)" xmi:id="_s7URxAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_DestroyObjectActionTargetShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3096" name="DataInput (3096)" xmi:id="_s7URxAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3096</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3101" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3101" name="DataInput (3101)" xmi:id="_s7URxgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_AddVariableValueActionValueShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3101" name="DataInput (3101)" xmi:id="_s7URxgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URxwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3101</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3103" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3103" name="DataInput (3103)" xmi:id="_s7URyAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_BroadcastSignalActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3103" name="DataInput (3103)" xmi:id="_s7URyAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URyQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3103</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3105" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3105" name="DataInput (3105)" xmi:id="_s7URygkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_LoopNodeVariableInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3105" name="DataInput (3105)" xmi:id="_s7URygkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URywkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3105</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3188" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3188" name="DataInput (3188)" xmi:id="_s7URzAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StructuredActivityNodeInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3188" name="DataInput (3188)" xmi:id="_s7URzAkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzQkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3188</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StructuredActivityNodeInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3133" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3133" name="DataInput (3133)" xmi:id="_s7URzgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StartObjectBehaviorActionArgumentShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3133" name="DataInput (3133)" xmi:id="_s7URzgkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7URzwkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3133</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StartObjectBehaviorActionArgumentShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3134" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3134" name="DataInput (3134)" xmi:id="_s7UR0AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_TestIdentityActionFirstShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3134" name="DataInput (3134)" xmi:id="_s7UR0AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3134</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_TestIdentityActionFirstShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3136" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3136" name="DataInput (3136)" xmi:id="_s7UR0gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ClearStructuralFeatureActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3136" name="DataInput (3136)" xmi:id="_s7UR0gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR0wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3136</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ClearStructuralFeatureActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3137" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3137" name="DataInput (3137)" xmi:id="_s7UR1AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CreateLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3137" name="DataInput (3137)" xmi:id="_s7UR1AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3137</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CreateLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3138" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3138" name="DataInput (3138)" xmi:id="_s7UR1gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReadLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3138" name="DataInput (3138)" xmi:id="_s7UR1gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR1wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3138</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3139" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3139" name="DataInput (3139)" xmi:id="_s7UR2AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_DestroyLinkActionInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3139" name="DataInput (3139)" xmi:id="_s7UR2AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3139</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_DestroyLinkActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3140" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3140" name="DataInput (3140)" xmi:id="_s7UR2gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ClearAssociationActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3140" name="DataInput (3140)" xmi:id="_s7UR2gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR2wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3140</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ClearAssociationActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3141" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3141" name="DataInput (3141)" xmi:id="_s7UR3AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReclassifyObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3141" name="DataInput (3141)" xmi:id="_s7UR3AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3141</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReclassifyObjectActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3142" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3142" name="DataInput (3142)" xmi:id="_s7UR3gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReadIsClassifiedObjectActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3142" name="DataInput (3142)" xmi:id="_s7UR3gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR3wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3142</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReadIsClassifiedObjectActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3143" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3143" name="DataInput (3143)" xmi:id="_s7UR4AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_ReduceActionCollectionShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3143" name="DataInput (3143)" xmi:id="_s7UR4AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3143</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_ReduceActionCollectionShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3144" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3144" name="DataInput (3144)" xmi:id="_s7UR4gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_StartClassifierBehaviorActionObjectShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3144" name="DataInput (3144)" xmi:id="_s7UR4gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR4wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3144</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_StartClassifierBehaviorActionObjectShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3199" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3199" name="DataInput (3199)" xmi:id="_s7UR5AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="InputPin_CreateLinkObjectActionInputShape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_InputPin_3199" name="DataInput (3199)" xmi:id="_s7UR5AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InputPin.gif" xmi:id="_s7UR5QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_InputPin</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.InputPin_3199</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.InputPin_CreateLinkObjectActionInputShape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3001" identifier="org.eclipse.papyrus.bpmn.process.DataInput_Parameter_3001" name="DataInput Parameter" xmi:id="_s7UR5gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Parameter_ParameterLabel" identifier="org.eclipse.papyrus.bpmn.process.DataInput_Parameter_3001" name="DataInput Parameter" xmi:id="_s7UR5gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Parameter.gif" xmi:id="_s7UR5wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_Parameter</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Parameter_3001</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Parameter_ParameterLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3059" identifier="org.eclipse.papyrus.bpmn.process.DataInput_ActivityParameterNode_3059" name="DataInput ActivityParameterNode" xmi:id="_s7UR6AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ActivityParameterNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.DataInput_ActivityParameterNode_3059" name="DataInput ActivityParameterNode" xmi:id="_s7UR6AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityParameterNode.gif" xmi:id="_s7UR6QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ActivityParameterNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4003" identifier="org.eclipse.papyrus.bpmn.process.DataAssociation_ObjectFlow_4003" name="DataAssociation ObjectFlow" xmi:id="_s7UR6gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ObjectFlow_Edge" identifier="org.eclipse.papyrus.bpmn.process.DataAssociation_ObjectFlow_4003" name="DataAssociation ObjectFlow" xmi:id="_s7UR6gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ObjectFlow.gif" xmi:id="_s7UR6wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.DataAssociation_ObjectFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ObjectFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.process.UserTask_OpaqueAction_3007" name="UserTask OpaqueAction" xmi:id="_s7UR7AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.UserTask_OpaqueAction_3007" name="UserTask OpaqueAction" xmi:id="_s7UR7AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.UserTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.process.ManualTask_OpaqueAction_3007" name="ManualTask OpaqueAction" xmi:id="_s7UR7gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ManualTask_OpaqueAction_3007" name="ManualTask OpaqueAction" xmi:id="_s7UR7gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ManualTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3080" identifier="org.eclipse.papyrus.bpmn.process.Documentation_Comment_3080" name="Documentation Comment" xmi:id="_s7UR8AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Comment_Shape" identifier="org.eclipse.papyrus.bpmn.process.Documentation_Comment_3080" name="Documentation Comment" xmi:id="_s7UR8AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif" xmi:id="_s7UR8QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Documentation_Comment</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Comment_3080</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Comment_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3002" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3002" name="BPMNRelationship (3002)" xmi:id="_s7UR8gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_PreconditionLabel" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3002" name="BPMNRelationship (3002)" xmi:id="_s7UR8gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR8wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3002</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_PreconditionLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3003" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3003" name="BPMNRelationship (3003)" xmi:id="_s7UR9AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_PostconditionLabel" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3003" name="BPMNRelationship (3003)" xmi:id="_s7UR9AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3003</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_PostconditionLabel</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3112" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3112" name="BPMNRelationship (3112)" xmi:id="_s7UR9gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="Constraint_Shape" identifier="org.eclipse.papyrus.bpmn.process.BPMNRelationship_Constraint_3112" name="BPMNRelationship (3112)" xmi:id="_s7UR9gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif" xmi:id="_s7UR9wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BPMNRelationship_Constraint</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.Constraint_3112</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.Constraint_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.SubProcess_StructuredActivityNode_3065" name="SubProcess StructuredActivityNode" xmi:id="_s7UR-AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.SubProcess_StructuredActivityNode_3065" name="SubProcess StructuredActivityNode" xmi:id="_s7UR-AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-QkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SubProcess_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.LoopCharacteristics_StructuredActivityNode_3065" name="LoopCharacteristics StructuredActivityNode" xmi:id="_s7UR-gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.LoopCharacteristics_StructuredActivityNode_3065" name="LoopCharacteristics StructuredActivityNode" xmi:id="_s7UR-gkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7UR-wkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.LoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <elementTypeConfigurations identifier="org.eclipse.papyrus.bpmn.process.CallActivity_CallBehaviorAction" name="CallActivity CallBehaviorAction" xmi:id="_s7UR_AkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallBehaviorAction.gif" xmi:id="_s7UR_QkGEeWVleXnap4Kwg"/>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_BaseType</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallBehaviorAction_BaseType</specializedTypesID>
     <matcherConfiguration xmi:id="_s7UR_gkGEeWVleXnap4Kwg" xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration">
       <stereotypesQualifiedNames>BPMNProfile::CallActivity</stereotypesQualifiedNames>
     </matcherConfiguration>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.process.BusinessRuleTask_OpaqueAction_3007" name="BusinessRuleTask OpaqueAction" xmi:id="_s7UR_wkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.BusinessRuleTask_OpaqueAction_3007" name="BusinessRuleTask OpaqueAction" xmi:id="_s7UR_wkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USAAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.BusinessRuleTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="4004" identifier="org.eclipse.papyrus.bpmn.process.ComplexBehaviorDefinition_ControlFlow_4004" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_s7USAQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ControlFlow_Edge" identifier="org.eclipse.papyrus.bpmn.process.ComplexBehaviorDefinition_ControlFlow_4004" name="ComplexBehaviorDefinition ControlFlow" xmi:id="_s7USAQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ControlFlow.gif" xmi:id="_s7USAgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ComplexBehaviorDefinition_ControlFlow</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ControlFlow_Edge</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.AdHocSubProcess_StructuredActivityNode_3065" name="AdHocSubProcess StructuredActivityNode" xmi:id="_s7USAwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.AdHocSubProcess_StructuredActivityNode_3065" name="AdHocSubProcess StructuredActivityNode" xmi:id="_s7USAwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USBAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.AdHocSubProcess_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.process.ScriptTask_OpaqueAction_3007" name="ScriptTask OpaqueAction" xmi:id="_s7USBQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ScriptTask_OpaqueAction_3007" name="ScriptTask OpaqueAction" xmi:id="_s7USBQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7USBgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ScriptTask_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.SendTask_CallOperationAction_3010" name="SendTask CallOperationAction" xmi:id="_s7USBwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.SendTask_CallOperationAction_3010" name="SendTask CallOperationAction" xmi:id="_s7USBwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USCAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.SendTask_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.Transaction_StructuredActivityNode_3065" name="Transaction StructuredActivityNode" xmi:id="_s7USCQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.Transaction_StructuredActivityNode_3065" name="Transaction StructuredActivityNode" xmi:id="_s7USCQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USCgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Transaction_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3071" identifier="org.eclipse.papyrus.bpmn.process.StandardLoopCharacteristics_LoopNode_3071" name="StandardLoopCharacteristics LoopNode" xmi:id="_s7USCwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="LoopNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.StandardLoopCharacteristics_LoopNode_3071" name="StandardLoopCharacteristics LoopNode" xmi:id="_s7USCwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/LoopNode.gif" xmi:id="_s7USDAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_LoopNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.LoopNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.StandardLoopCharacteristics_StructuredActivityNode_3065" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_s7USDQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.StandardLoopCharacteristics_StructuredActivityNode_3065" name="StandardLoopCharacteristics StructuredActivityNode" xmi:id="_s7USDQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USDgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.StandardLoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3063" identifier="org.eclipse.papyrus.bpmn.process.ReceiveTask_AcceptEventAction_3063" name="ReceiveTask AcceptEventAction" xmi:id="_s7USDwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="AcceptEventAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ReceiveTask_AcceptEventAction_3063" name="ReceiveTask AcceptEventAction" xmi:id="_s7USDwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/AcceptEventAction.gif" xmi:id="_s7USEAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ReceiveTask_AcceptEventAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.AcceptEventAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3010" identifier="org.eclipse.papyrus.bpmn.process.ServiceTask_CallOperationAction_3010" name="ServiceTask CallOperationAction" xmi:id="_s7USEQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="CallOperationAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.ServiceTask_CallOperationAction_3010" name="ServiceTask CallOperationAction" xmi:id="_s7USEQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/CallOperationAction.gif" xmi:id="_s7USEgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.ServiceTask_CallOperationAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.CallOperationAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3070" identifier="org.eclipse.papyrus.bpmn.process.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_s7USEwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="ExpansionRegion_Shape" identifier="org.eclipse.papyrus.bpmn.process.MultiInstanceLoopCharacteristics_ExpansionRegion_3070" name="MultiInstanceLoopCharacteristics ExpansionRegion" xmi:id="_s7USEwkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ExpansionRegion.gif" xmi:id="_s7USFAkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_ExpansionRegion</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.ExpansionRegion_Shape</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3065" identifier="org.eclipse.papyrus.bpmn.process.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_s7USFQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="StructuredActivityNode_Shape" identifier="org.eclipse.papyrus.bpmn.process.MultiInstanceLoopCharacteristics_StructuredActivityNode_3065" name="MultiInstanceLoopCharacteristics StructuredActivityNode" xmi:id="_s7USFQkGEeWVleXnap4Kwg" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StructuredActivityNode.gif" xmi:id="_s7USFgkGEeWVleXnap4Kwg"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.MultiInstanceLoopCharacteristics_StructuredActivityNode</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.StructuredActivityNode_Shape</specializedTypesID>
   </elementTypeConfigurations>
   <adviceBindingsConfigurations identifier="org.eclipse.papyrus.bpmn.process.definitions_PapyrusUMLActivityDiagram" target="_s7URSwkGEeWVleXnap4Kwg" xmi:id="_s7USFwkGEeWVleXnap4Kwg" xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration">
     <stereotypesToApply stereotypeQualifiedName="BPMNProfile::Definitions" updateName="true" xmi:id="_s7USGAkGEeWVleXnap4Kwg">
@@ -583,4 +583,4 @@
       <requiredProfiles>BPMNProfile</requiredProfiles>
     </stereotypesToApply>
   </adviceBindingsConfigurations>
-</elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
+ </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/processCustom.elementtypesconfigurations b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/processCustom.elementtypesconfigurations
index 349e6050eed..2f1ba8c77d1 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/processCustom.elementtypesconfigurations
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/processCustom.elementtypesconfigurations
@@ -3,9 +3,9 @@
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ActivityPartition.gif" xmi:id="_ODZj0RBDEeWXVJ4WhgYiRw"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Lane_ActivityPartition</specializedTypesID>
   </elementTypeConfigurations>
-  <elementTypeConfigurations hint="3007" identifier="org.eclipse.papyrus.bpmn.process.Task_Action_3007" name="Task Action" xmi:id="_s7UR7gkGEeWVleXnap4Kwg3" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
+  <elementTypeConfigurations hint="OpaqueAction_Shape" identifier="org.eclipse.papyrus.bpmn.process.Task_Action_3007" name="Task Action" xmi:id="_s7UR7gkGEeWVleXnap4Kwg3" xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration">
     <iconEntry bundleId="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/OpaqueAction.gif" xmi:id="_s7UR7wkGEeWVleXnap4Kwg4"/>
     <specializedTypesID>org.eclipse.papyrus.bpmn.Task_OpaqueAction</specializedTypesID>
-    <specializedTypesID>org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umldi.OpaqueAction_Shape</specializedTypesID>
   </elementTypeConfigurations>
 </elementtypesconfigurations:ElementTypeSetConfiguration>
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.assistants b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.assistants
index 5693f3add94..49858b34ac5 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.assistants
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/model/bpmn.assistants
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ASCII"?>
 <assistant:ModelingAssistantProvider xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:assistant="http://www.eclipse.org/Papyrus/2014/diagram/assistant" xmlns:filters="http://www.eclipse.org/Papyrus/2014/common/filters" xmlns:umlfilters="http://www.eclipse.org/Papyrus/2014/uml/filters" name="BPMNProfile">
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="InclusiveGateway_JoinNode_3041" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.InclusiveGateway_JoinNode_3041"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Activity_2001" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Activity_2001"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Activity_3083" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Activity_3083"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ConditionalNode_3069"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ExpansionRegion_3070"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.LoopNode_3071"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.SequenceNode_3073"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.StructuredActivityNode_3065"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Activity_Shape" elementTypeID="org.eclipse.papyrus.umldi.Activity_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Activity_Shape_CN" elementTypeID="org.eclipse.papyrus.umldi.Activity_Shape_CN"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ConditionalNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.ConditionalNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ExpansionRegion_Shape" elementTypeID="org.eclipse.papyrus.umldi.ExpansionRegion_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.LoopNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.LoopNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.SequenceNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.SequenceNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.StructuredActivityNode_Shape"/>
   <ownedFilter xsi:type="filters:CompoundFilter" name="pertains to Profile BPMNProfile" filter="//@ownedFilter.8/@ownedFilter.0 //@ownedFilter.8/@ownedFilter.1" operator="or">
     <ownedFilter xsi:type="umlfilters:ProfileApplied" name="BPMNProfile is applied in context" profileQualifiedName="BPMNProfile" profileURI="platform:/resource/org.eclipse.papyrus.bpmn/model/bpmn.profile.uml#_wrG1oHwkEeOWLfCz6n-rOA"/>
     <ownedFilter xsi:type="assistant:AssistedElementTypeFilter"/>
@@ -15,14 +15,14 @@
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="InclusiveGateway_ForkNode_3040" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.InclusiveGateway_ForkNode_3040"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="EventBasedGateway_ForkNode_3040" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.EventBasedGateway_ForkNode_3040"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="EventBasedGateway_StructuredActivityNode_3065" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.EventBasedGateway_StructuredActivityNode_3065"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3016"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3018"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3021"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3026"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3047"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3050"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3053"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActionInputPin_3061"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_OpaqueActionInputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_CallBehaviorActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_CallOperationActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionRequestShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_SendObjectActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.SendObjectActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.SendSignalActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.ActionInputPin_SendSignalActionTargetShape"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="EventBasedGateway_InterruptibleActivityRegion_3068" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.EventBasedGateway_InterruptibleActivityRegion_3068"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="NonExclusiveGateway_JoinNode_3041" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.NonExclusiveGateway_JoinNode_3041"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="NonExclusiveGateway_ForkNode_3040" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.NonExclusiveGateway_ForkNode_3040"/>
@@ -33,7 +33,7 @@
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="ExclusiveGateway_DecisionNode_3038" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.ExclusiveGateway_DecisionNode_3038"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="ExclusiveGateway_MergeNode_3039" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.ExclusiveGateway_MergeNode_3039"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="LaneSet_ActivityPartition_3067" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.LaneSet_ActivityPartition_3067"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActivityPartition_3067"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActivityPartition_Shape" elementTypeID="org.eclipse.papyrus.umldi.ActivityPartition_Shape"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="BPMNProcess_Activity_2001" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.BPMNProcess_Activity_2001"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="BPMNProcess_Activity_3083" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.BPMNProcess_Activity_3083"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Lane_ActivityPartition_3067" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.Lane_ActivityPartition_3067"/>
@@ -55,88 +55,88 @@
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="ImplicitThrowEvent_CallOperationAction_3010" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.ImplicitThrowEvent_CallOperationAction_3010"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="ImplicitThrowEvent_FlowFinalNode_3006" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.ImplicitThrowEvent_FlowFinalNode_3006"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="TextAnnotation_Comment_3080" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.TextAnnotation_Comment_3080"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.AcceptEventAction_3063"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActivityFinalNode_3005"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ActivityParameterNode_3059"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.AddStructuralFeatureValueAction_3091"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.AddVariableValueAction_3099"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.BroadcastSignalAction_3102"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.CallBehaviorAction_3008"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.CallOperationAction_3010"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.CentralBufferNode_3104"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Comment_3080" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Comment_3080"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Constraint_3002"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Constraint_3003"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Constraint_3011"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Constraint_3012"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Constraint_3112"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ControlFlow_4004"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.CreateObjectAction_3086"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.DataStoreNode_3078"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.DecisionNode_3038"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.DestroyObjectAction_3095"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3034"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.DurationConstraint_3035"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ExceptionHandler_4005"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3074"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ExpansionNode_3075"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.FlowFinalNode_3006"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ForkNode_3040"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InitialNode_3004"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3013"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3019"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3023"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3027"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3048"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3051"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3055"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3062"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3089"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3092"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3093"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3096"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3100"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3101"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3103"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InputPin_3105"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.InterruptibleActivityRegion_3068"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3032"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.IntervalConstraint_3033"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.JoinNode_3041"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.MergeNode_3039"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.NamedElement_3085"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ObjectFlow_4003"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OpaqueAction_3007"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3014"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3020"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3024"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3064"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3077"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3084"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3087"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3090"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3094"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3098"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3109"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3110"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.OutputPin_3111"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.Parameter_3001"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ReadSelfAction_3081"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ReadStructuralFeatureAction_3088"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ReadVariableAction_3097"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.SendObjectAction_3042"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.SendSignalAction_3052"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3036"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.TimeConstraint_3037"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3015"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3017"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3022"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3025"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3046"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3049"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3054"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValuePin_3060"/>
-  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076" elementTypeID="org.eclipse.papyrus.uml.diagram.activity.ValueSpecificationAction_3076"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.AcceptEventAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.AcceptEventAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.ActivityFinalNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.ActivityParameterNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.AddStructuralFeatureValueAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.AddVariableValueAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.BroadcastSignalAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.CallBehaviorAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.CallOperationAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.CallOperationAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.CentralBufferNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.CentralBufferNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Comment_Shape" elementTypeID="org.eclipse.papyrus.umldi.Comment_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel" elementTypeID="org.eclipse.papyrus.umldi.Constraint_PreconditionLabel"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel" elementTypeID="org.eclipse.papyrus.umldi.Constraint_PostconditionLabel"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape" elementTypeID="org.eclipse.papyrus.umldi.Constraint_LocalPreconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape" elementTypeID="org.eclipse.papyrus.umldi.Constraint_LocalPostconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Constraint_Shape" elementTypeID="org.eclipse.papyrus.umldi.Constraint_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ControlFlow_Edge" elementTypeID="org.eclipse.papyrus.umldi.ControlFlow_Edge"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.CreateObjectAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.CreateObjectAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.DataStoreNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.DataStoreNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.DecisionNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.DecisionNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.DestroyObjectAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape" elementTypeID="org.eclipse.papyrus.umldi.DurationConstraint_LocalPreconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape" elementTypeID="org.eclipse.papyrus.umldi.DurationConstraint_LocalPostconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ExceptionHandler_Edge" elementTypeID="org.eclipse.papyrus.umldi.ExceptionHandler_Edge"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ExpansionNode_InputShape" elementTypeID="org.eclipse.papyrus.umldi.ExpansionNode_InputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape" elementTypeID="org.eclipse.papyrus.umldi.ExpansionNode_OutputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.FlowFinalNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.FlowFinalNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ForkNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.ForkNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InitialNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.InitialNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_OpaqueActionInputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_CallBehaviorActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_CallOperationActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_CallOperationActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_SendObjectActionRequestShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_SendObjectActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_SendSignalActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_SendSignalActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_ReadStructuralFeatureActionObjectShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionObjectShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_AddStructuralFeatureValueActionValueShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_DestroyObjectActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionInsertAtShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_AddVariableValueActionValueShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_BroadcastSignalActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape" elementTypeID="org.eclipse.papyrus.umldi.InputPin_LoopNodeVariableInputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape" elementTypeID="org.eclipse.papyrus.umldi.InterruptibleActivityRegion_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape" elementTypeID="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPreconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape" elementTypeID="org.eclipse.papyrus.umldi.IntervalConstraint_LocalPostconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.JoinNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.JoinNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.MergeNode_Shape" elementTypeID="org.eclipse.papyrus.umldi.MergeNode_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.NamedElement_DefaultShape" elementTypeID="org.eclipse.papyrus.umldi.NamedElement_DefaultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ObjectFlow_Edge" elementTypeID="org.eclipse.papyrus.umldi.ObjectFlow_Edge"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OpaqueAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.OpaqueAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_OpaqueActionOutputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_CallBehaviorActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_CallOperationActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_AcceptEventActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_ValueSpecificationActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_ReadSelfActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_CreateObjectActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_ReadStructuralFeatureActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_AddStructuralFeatureValueActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_ReadVariableActionResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_LoopNodeBodyOutputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape" elementTypeID="org.eclipse.papyrus.umldi.OutputPin_LoopNodeVariableShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.LoopNodeResultShape" elementTypeID="org.eclipse.papyrus.umldi.LoopNodeResultShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.Parameter_ParameterLabel" elementTypeID="org.eclipse.papyrus.umldi.Parameter_ParameterLabel"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ReadSelfAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.ReadSelfAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.ReadStructuralFeatureAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ReadVariableAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.ReadVariableAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.SendObjectAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.SendObjectAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.SendSignalAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.SendSignalAction_Shape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape" elementTypeID="org.eclipse.papyrus.umldi.TimeConstraint_LocalPreconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape" elementTypeID="org.eclipse.papyrus.umldi.TimeConstraint_LocalPostconditionShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_OpaqueActionInputShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_CallBehaviorActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_CallOperationActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionRequestShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_SendObjectActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionArgumentShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape" elementTypeID="org.eclipse.papyrus.umldi.ValuePin_SendSignalActionTargetShape"/>
+  <ownedFilter xsi:type="assistant:ElementTypeFilter" name="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape" elementTypeID="org.eclipse.papyrus.umldi.ValueSpecificationAction_Shape"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="Group_ActivityPartition_3067" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.Group_ActivityPartition_3067"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="SequenceFlow_ControlFlow_4004" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.SequenceFlow_ControlFlow_4004"/>
   <ownedFilter xsi:type="assistant:ElementTypeFilter" name="DataObjectReference_DataStoreNode_3078" elementTypeID="org.eclipse.papyrus.bpmn.bPMNProfile.DataObjectReference_DataStoreNode_3078"/>
-- 
cgit v1.2.3